 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 |
|
|
yuezhihang
|
dfc10e4b0f
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-08 19:38:54 +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 |
|
|
yuezhihang
|
bee6ef8a8a
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 14:15:16 +08:00 |
|
|
yuezhihang
|
035b294423
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-08 14:14:51 +08:00 |
|
|
yuezhihang
|
c611fc2234
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 14:07:30 +08: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 |
|
|
duanwenbin
|
1ed0888256
|
提交ocr模块配置
|
2021-07-08 09:22:56 +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 |
|
|
root
|
fb05c70666
|
test
|
2021-07-07 10:52:45 +08:00 |
|
|
王夏晖
|
3c7acb2705
|
Update application-dev.properties
|
2021-07-07 02:21:45 +00:00 |
|
|
yinglong zhang
|
b39fda6c43
|
feat 改回注册中心配置
|
2021-07-07 09:55:52 +08:00 |
|
|
yinglong zhang
|
f91b481180
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
|
2021-07-07 09:54:08 +08:00 |
|
|
yinglong zhang
|
9a00280ba0
|
feat 改回注册中心配置
|
2021-07-07 09:53:29 +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
|
643ce6b932
|
标准清单入库流程
|
2021-07-05 15:45:24 +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 |
|
|
yinglong zhang
|
367b0f5f7c
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-05 15:02:05 +08:00 |
|
|
yinglong zhang
|
773b75a3fe
|
feat 合并分支
|
2021-07-05 15:01:40 +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 |
|
|
super_liu
|
75a7a90e9d
|
Merge branch 'develop_master' into develop_3
|
2021-07-05 11:10:43 +08:00 |
|
|
王夏晖
|
7bb46ef07f
|
Update application-dev.properties
|
2021-07-05 02:34:45 +00: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 |
|