 root
|
c84a8a63ee
|
fetch:机构接口修改
|
2021-07-05 14:57:15 +08:00 |
|
|
root
|
011b5e247a
|
同步代码
|
2021-07-05 10:32:41 +08:00 |
|
|
root
|
9e97c80c5e
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
Conflicts:
adc-da-main/src/main/resources/application-dev.properties
|
2021-07-04 16:48:26 +08:00 |
|
|
root
|
1f9f5ac2fa
|
查询机构人员
|
2021-07-04 16:45:52 +08:00 |
|
|
yinglong zhang
|
531bb9e7ce
|
feat 合并分支
|
2021-07-04 16:41:37 +08:00 |
|
|
2510220824
|
a6442d5b8d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-04 13:58:21 +08:00 |
|
|
2510220824
|
3e69a462b0
|
add:IDM组织、人员数据同步
|
2021-07-04 13:57:56 +08:00 |
|
|
root
|
afee88a408
|
fetch:资源修改
|
2021-07-02 17:32:26 +08:00 |
|
|
zxy-lbj
|
8e5b8bb239
|
Update application.properties
|
2021-07-02 03:29:41 +00:00 |
|
|
zxy-lbj
|
64e95dc4a6
|
Update application-dev.properties
|
2021-07-02 03:28:49 +00:00 |
|
|
zxy-lbj
|
eb5f2a9e87
|
Update RestTemplateConfig.java
|
2021-07-02 03:14:22 +00:00 |
|
|
zxy-lbj
|
062d948719
|
Update RestTemplateConfig.java
|
2021-07-02 03:06:30 +00:00 |
|
|
zxy-lbj
|
6c56c8ba29
|
Update RestTemplateConfig.java
|
2021-07-02 03:04:04 +00:00 |
|
|
root
|
4a8b94408d
|
fetch:加入负载均衡
|
2021-07-02 11:02:29 +08:00 |
|
|
zxy-lbj
|
e487fc3a79
|
Update application-dev.properties
|
2021-07-02 02:38:07 +00:00 |
|
|
root
|
086c387165
|
查询机构人员
|
2021-07-01 18:17:04 +08:00 |
|
|
root
|
462062e6b5
|
fetch:循环依赖
|
2021-07-01 14:20:18 +08:00 |
|
|
root
|
d8cbcad8c9
|
fetch:循环依赖
|
2021-07-01 14:19:41 +08:00 |
|
|
root
|
af2bf00713
|
fetch:解决循环依赖
|
2021-07-01 14:05:27 +08:00 |
|
|
zxy-lbj
|
03162b8e85
|
Update application-dev.properties
|
2021-07-01 03:31:06 +00:00 |
|
|
root
|
349737cd67
|
fetch:权限
|
2021-07-01 10:50:56 +08:00 |
|
|
root
|
b543a9502d
|
资源管理
|
2021-06-30 17:28:39 +08:00 |
|
|
root
|
bad0f16f90
|
fetch:取消serach模块
|
2021-06-30 14:01:31 +08:00 |
|
|
root
|
52015144b5
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
Conflicts:
adc-da-main/src/main/resources/application-dev.properties
|
2021-06-30 13:37:56 +08:00 |
|
|
王夏晖
|
b69bc81066
|
Update application-dev.properties
|
2021-06-30 05:02:07 +00:00 |
|
|
root
|
c4a885922d
|
获取当前登录的用户权限
|
2021-06-29 17:28:16 +08:00 |
|
|
yinglong zhang
|
33254d9248
|
Merge remote-tracking branch 'origin/develop_master' into develop_2
|
2021-06-29 16:34:44 +08:00 |
|
|
root
|
39e5e4c4c5
|
人员配置机构
|
2021-06-29 16:34:02 +08:00 |
|
|
王夏晖
|
95f8f7dfff
|
Merge branch 'develop_1' into 'develop_master'
add:标准法规清单
See merge request !14
|
2021-06-29 06:57:10 +00:00 |
|
|
yinglong zhang
|
4533960ef9
|
feat 修改了一些搜索模块
|
2021-06-29 09:07:06 +08:00 |
|
|
赵肖云
|
26a5022c03
|
fetch:新增查询角色详情接口
|
2021-06-28 13:56:19 +08:00 |
|
|
zzy
|
346866e0ba
|
add:标准法规清单
|
2021-06-27 16:02:59 +08:00 |
|
|
赵肖云
|
8378ec131c
|
Merge branch 'develop_2' of http://103.249.252.28:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-06-25 15:49:42 +08:00 |
|
|
赵肖云
|
209f43fe1a
|
fetch:人员添加字段
|
2021-06-25 15:49:30 +08:00 |
|
|
yinglong zhang
|
89a7a5ee7f
|
feat 合并分支
|
2021-06-24 17:50:12 +08:00 |
|
|
yinglong zhang
|
31ee78f374
|
feat 合并分支
|
2021-06-24 17:39:01 +08:00 |
|
|
赵肖云
|
1398f34c1e
|
角色添加权限
|
2021-06-24 14:08:51 +08:00 |
|
|
赵肖云
|
2854d385f1
|
Merge remote-tracking branch 'origin/develop_2' into develop_2
|
2021-06-24 11:22:39 +08:00 |
|
|
赵肖云
|
11a5e50621
|
fetch:删除角色
|
2021-06-24 11:22:21 +08:00 |
|
|
yinglong zhang
|
a069424edf
|
feat 重写了一些诡异的代码
|
2021-06-24 11:05:25 +08:00 |
|
|
赵肖云
|
b0751be63a
|
岗位管理
|
2021-06-24 10:43:53 +08:00 |
|
|
yinglong zhang
|
7aeb6b099a
|
feat 重写了一些诡异的代码
|
2021-06-24 10:23:52 +08:00 |
|
|
yinglong zhang
|
f284c60088
|
feat 重写了一些诡异的代码
|
2021-06-24 09:58:06 +08:00 |
|
|
super_liu
|
d957107510
|
Merge branch 'develop_3' into 'develop_master'
feat: 登陆修改
See merge request !13
|
2021-06-23 07:26:03 +00:00 |
|
|
super_liu
|
fa985d2d58
|
feat: 登陆修改
|
2021-06-23 15:25:41 +08:00 |
|
|
yinglong zhang
|
a01ca3fd49
|
feat 重写了一些诡异的代码
|
2021-06-23 10:43:31 +08:00 |
|
|
赵肖云
|
a1503fd90f
|
fetch:UUID修改
|
2021-06-23 09:22:55 +08:00 |
|
|
super_liu
|
bd01b11ea8
|
Merge branch 'develop_master' into develop_3
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
|
2021-06-22 18:15:00 +08:00 |
|
|
super_liu
|
e985820f27
|
Merge branch 'develop_3' into 'develop_master'
Develop 3 提交
See merge request !12
|
2021-06-22 10:12:39 +00:00 |
|
|
super_liu
|
541c4d0bda
|
Merge branch 'develop_1' into 'develop_master'
update:修改路径
See merge request !11
|
2021-06-22 10:07:29 +00:00 |
|