 root
|
ffe3b2b8c3
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-09 09:50:15 +08:00 |
|
|
root
|
5bbf8556f6
|
fetch:数据处理
|
2021-07-09 09:49:38 +08:00 |
|
|
root
|
7fda1c196c
|
fetch:我的板块改为二级菜单
|
2021-07-08 18:53:33 +08:00 |
|
|
root
|
142ff05355
|
fetch:我的板块bug
|
2021-07-08 16:58:00 +08:00 |
|
|
root
|
e73e07d681
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-08 15:55:00 +08:00 |
|
|
root
|
9020a2782f
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-08 15:46:53 +08:00 |
|
|
root
|
9432d1a2f4
|
fetch:我的模块数据
|
2021-07-08 15:46:19 +08:00 |
|
|
root
|
fb05c70666
|
test
|
2021-07-07 10:52:45 +08:00 |
|
|
root
|
1ea0d09cb0
|
fetch:机构人员bug
|
2021-07-06 17:30:30 +08:00 |
|
|
root
|
5bc2050104
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-05 14:58:16 +08:00 |
|
|
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 |
|
|
root
|
afee88a408
|
fetch:资源修改
|
2021-07-02 17:32:26 +08:00 |
|
|
root
|
4a8b94408d
|
fetch:加入负载均衡
|
2021-07-02 11:02:29 +08: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 |
|
|
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 |
|
|
root
|
c4a885922d
|
获取当前登录的用户权限
|
2021-06-29 17:28:16 +08:00 |
|
|
root
|
39e5e4c4c5
|
人员配置机构
|
2021-06-29 16:34:02 +08:00 |
|
|
root
|
2bb3aab2e0
|
未符合项/重点问题管理
|
2021-06-17 11:20:10 +08:00 |
|
|
root
|
eb86294f15
|
update:恢复main模块
|
2021-06-15 19:53:52 +08:00 |
|
|
root
|
790ad9e525
|
删除测试类
|
2021-06-15 17:13:39 +08:00 |
|
|
root
|
c0a1708f47
|
取消main模块git关联
|
2021-06-15 17:05:31 +08:00 |
|
|
root
|
689a394a5a
|
修改配置
|
2021-06-15 16:42:29 +08:00 |
|
|
root
|
1fdfc7a7fb
|
未符合项代码生成
|
2021-06-15 16:41:26 +08:00 |
|