zhenghaoyu
|
90fd064cbc
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
7767af3347
|
1.auth配置文件还原
|
1 year ago |
|
zhenghaoyu
|
86f419cb2d
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
37cdfe8291
|
1.auth配置文件更新
|
1 year ago |
|
zhenghaoyu
|
51a1dc6b42
|
代码更新
|
1 year ago |
|
zhenghaoyu
|
bcec54fda4
|
Merge branch 'dev' into pre-production
# Conflicts:
# blade-ops/blade-resource/src/main/resources/application.yml
|
1 year ago |
pref_mail@163.com
|
2b2523fad0
|
1.合并框架代码2
|
1 year ago |
|
pref_mail@163.com
|
8b26902b11
|
1.代码合并2
|
1 year ago |
|
pref_mail@163.com
|
a1d2c146d6
|
1.代码合并
|
1 year ago |
|
pref_mail@163.com
|
239e4ba3bb
|
Merge branch 'master-2023-10-23' into dev
# Conflicts:
# blade-ops/blade-resource/src/main/java/org/springblade/resource/builder/OssBuilder.java
# blade-ops/blade-resource/src/main/resources/application.yml
# blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TenantServiceImpl.java
|
1 year ago |
|
pref_mail@163.com
|
88b9447df0
|
Merge branch 'up-master-2023-10' into dev
# Conflicts:
# blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
# pom.xml
|
1 year ago |
|
pref_mail@163.com
|
891fdeba3a
|
Merge branch 'master' of http://47.108.105.48:3000/java_project/LogisticsPlatform
|
1 year ago |
|
zhenghaoyu
|
273b795cc6
|
Merge remote-tracking branch 'origin/pre-production'
|
1 year ago |
|
zhenghaoyu
|
5d28545d6b
|
Merge branch 'dev' into pre-production
|
1 year ago |
0.0
|
14e6d00ff8
|
1.修改类型
|
1 year ago |
|
0.0
|
a26335ca8b
|
1.删除租户
|
1 year ago |
|
pref_mail@163.com
|
b817738a53
|
1.修改基础平台代码 增加手机号查询账号接口
|
1 year ago |
|
pref_mail@163.com
|
7d1bc5c7ce
|
Merge branch 'pre-production'
|
1 year ago |
|
pref_mail@163.com
|
39e6b69157
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
c646d6be53
|
1.修改账号查询账号 电话号码
|
1 year ago |
|
pref_mail@163.com
|
edd72a3a8f
|
Merge branch 'pre-production'
|
1 year ago |
|
pref_mail@163.com
|
41a85b0114
|
Merge branch 'dev' into pre-production
|
1 year ago |
kilo
|
0907ce33da
|
手机号码查询用户
|
1 year ago |
|
pref_mail@163.com
|
950f4bc52e
|
Merge branch 'pre-production'
|
1 year ago |
|
pref_mail@163.com
|
d937bb464e
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
5f778fdcc4
|
Merge remote-tracking branch 'origin/pre-production' into pre-production
# Conflicts:
# blade-auth/src/test/java/org/springblade/auth/TestService.java
|
1 year ago |
|
0.0
|
93b939f6b2
|
1.更新pda
|
1 year ago |
|
0.0
|
8de9977bfe
|
1.修改pda排序
|
1 year ago |
|
0.0
|
f5cc068bf8
|
1.根据用户名称查询
|
1 year ago |
|
pref_mail@163.com
|
ba9de0c767
|
Merge remote-tracking branch 'origin/master'
|
1 year ago |
|
zhenghaoyu
|
4b08316b5e
|
1.配置修改
|
1 year ago |
|
zhenghaoyu
|
c10c24d3ef
|
1.配置修改
|
1 year ago |
|
zhenghaoyu
|
6924186b70
|
Merge branch 'dev' into pre-production
# Conflicts:
# blade-auth/src/test/java/org/springblade/auth/TestService.java
# blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
|
1 year ago |
|
zhenghaoyu
|
358ffae2ca
|
1.删除不要的文件
|
1 year ago |
|
pref_mail@163.com
|
f1dc477349
|
1.增加欧派的日志存储单独的bucket
|
1 year ago |
|
pref_mail@163.com
|
920f26ecd8
|
Merge remote-tracking branch 'origin/pre-production' into pre-production
# Conflicts:
# blade-auth/src/test/java/org/springblade/auth/TestService.java
# blade-service/blade-system/src/main/java/org/springblade/system/SystemApplication.java
|
1 year ago |
|
pref_mail@163.com
|
2dc63acdb1
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
pref_mail@163.com
|
e30afb02ef
|
1.增加欧派的日常寸尺单独的bucket
|
1 year ago |
|
pref_mail@163.com
|
ac0c1ccdc2
|
1.增加swagger
|
1 year ago |
|
pref_mail@163.com
|
38481ac70d
|
1.增加swagger
|
1 year ago |
|
pref_mail@163.com
|
e035f8b070
|
1.修复名称
|
1 year ago |
|
pref_mail@163.com
|
94d345a8e9
|
1.删除测试
|
1 year ago |
|
pref_mail@163.com
|
60b54faa5c
|
1.删除测试
|
1 year ago |
|
zhenghaoyu
|
7dc15d81f4
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
0.0
|
428c142ca7
|
Merge remote-tracking branch 'origin/dev' into dev
|
1 year ago |
|
0.0
|
aef4dc8342
|
1.Pda版本
|
1 year ago |
|
zhenghaoyu
|
a11fac1bf8
|
1.代码还原
|
1 year ago |
|
zhenghaoyu
|
1fcd12a0c9
|
Merge branch 'dev' into pre-production
|
1 year ago |
|
zhenghaoyu
|
862babe39b
|
1.测试代码提交
|
1 year ago |
|
0.0
|
d9efc35a7d
|
1.后台版本控制
|
1 year ago |
