 root
|
5bbf8556f6
|
fetch:数据处理
|
2021-07-09 09:49:38 +08:00 |
|
|
super_liu
|
78d87640eb
|
Merge branch 'develop_3' into 'develop_master'
Develop 3 feat: 标准库 左侧树 相关 配置标准 更新记录相关等
See merge request !18
|
2021-07-08 14:59:10 +00:00 |
|
|
super_liu
|
0842280775
|
feat: 标准库详情 更新记录
|
2021-07-08 22:56:50 +08:00 |
|
|
super_liu
|
e067c8ae61
|
feat: 标准库 左侧树 相关 配置标准 相关等
|
2021-07-08 22:34:07 +08:00 |
|
|
yuezhihang
|
4b8aac9bc4
|
标准 发布搞
|
2021-07-08 21:04:18 +08:00 |
|
|
yuezhihang
|
0a5b8d8580
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 20:17:00 +08:00 |
|
|
zzy
|
04792ee931
|
add:分解单查询
|
2021-07-08 20:05:12 +08:00 |
|
|
zzy
|
e998809767
|
add:分解单查询
|
2021-07-08 20:04:47 +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 |
|
|
duanwenbin
|
4bfbd48dc6
|
提交本地工具-标准比对的相关接口
|
2021-07-08 15:50:05 +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 |
|
|
super_liu
|
4f7d1648db
|
Merge branch 'develop_3' into 'develop_master'
feat: 数据字典 树形结构
See merge request !17
|
2021-07-08 06:20:39 +00:00 |
|
|
super_liu
|
521c81c8bb
|
Merge branch 'develop_1' into 'develop_master'
update:优化查询速度
See merge request !16
|
2021-07-08 06:19:52 +00:00 |
|
|
zj
|
8aade0862c
|
add:产品线项目经理
|
2021-07-08 14:06:07 +08:00 |
|
|
super_liu
|
f59419de62
|
feat: 数据字典 树形结构
|
2021-07-08 14:00:51 +08:00 |
|
|
duanwenbin
|
2e8a2bba51
|
提交本地工具-标准拆分相关接口
|
2021-07-08 11:21:18 +08:00 |
|
|
zzy
|
0c8df99fd2
|
update:优化查询速度
|
2021-07-08 09:17:52 +08:00 |
|
|
duanwenbin
|
c1a0b31372
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
|
2021-07-07 11:23:08 +08:00 |
|
|
duanwenbin
|
9709acf0a9
|
提交本地工具模块相关代码
|
2021-07-07 11:21:42 +08:00 |
|
|
yuezhihang
|
9f856079ee
|
标准清单入库 bug修复
|
2021-07-06 20:14:34 +08:00 |
|
|
yuezhihang
|
b4c0465f18
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-06 19:12:25 +08:00 |
|
|
zzy
|
106e808b99
|
update:清单修改，清单新增
|
2021-07-06 18:08:08 +08:00 |
|
|
root
|
1ea0d09cb0
|
fetch:机构人员bug
|
2021-07-06 17:30:30 +08:00 |
|
|
super_liu
|
51bd89fc13
|
Merge branch 'develop_3' into 'develop_master'
hh Develop 3
See merge request !15
|
2021-07-06 08:12:45 +00:00 |
|
|
super_liu
|
bd73773b19
|
feat: 国内外标准 树形结构查询标准库
|
2021-07-06 16:05:27 +08:00 |
|
|
yuezhihang
|
2004286bca
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
# adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java
|
2021-07-05 15:43:45 +08:00 |
|
|
yuezhihang
|
2f462ccdb7
|
标准清单入库流程
|
2021-07-05 15:42:42 +08:00 |
|
|
root
|
c84a8a63ee
|
fetch:机构接口修改
|
2021-07-05 14:57:15 +08:00 |
|
|
super_liu
|
75a7a90e9d
|
Merge branch 'develop_master' into develop_3
|
2021-07-05 11:10:43 +08:00 |
|
|
root
|
011b5e247a
|
同步代码
|
2021-07-05 10:32:41 +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
|
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 |
|