 yuezhihang
|
7d18b3ff7c
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-19 10:41:20 +08:00 |
|
|
super_liu
|
bc1a9e8241
|
feat: There is no way the
|
2021-08-19 10:38:21 +08:00 |
|
|
super_liu
|
c343a20ae2
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !116
|
2021-08-19 02:32:38 +00:00 |
|
|
super_liu
|
5675671cbf
|
Merge branch 'develop_master' into develop_3
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
|
2021-08-19 10:31:25 +08:00 |
|
|
super_liu
|
0aba76276f
|
feat: There is no way the
|
2021-08-19 10:26:31 +08:00 |
|
|
yanyizhou
|
732ee46c3e
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-19 10:04:23 +08:00 |
|
|
yanyizhou
|
4e588e6579
|
恢复代码
|
2021-08-19 10:04:09 +08:00 |
|
|
yuezhihang
|
cdb3a9ccd4
|
bug修复 !!!
|
2021-08-19 09:25:29 +08:00 |
|
|
yanyizhou
|
801eea7e50
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
还有标准清单的回显
|
2021-08-18 22:09:12 +08:00 |
|
|
yanyizhou
|
d457a93c13
|
标准法规清单新增限制
|
2021-08-18 19:16:52 +08:00 |
|
|
yanyizhou
|
89a136ee60
|
国家地区新增限制
|
2021-08-18 16:55:20 +08:00 |
|
|
yanyizhou
|
abbf9c257f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-18 16:44:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
01d0da14e8
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-18 16:42:28 +08:00 |
|
|
super_liu
|
bed2c167d9
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-18 16:31:16 +08:00 |
|
|
super_liu
|
150e2c96d2
|
feat: There is no way the User Menu auth
|
2021-08-18 16:30:58 +08:00 |
|
|
Mr.Z
|
dd6b2e76f9
|
之前的bug重新提交(T_T)~~~~
|
2021-08-18 16:19:40 +08:00 |
|
|
yuezhihang
|
508c292200
|
配置文件
|
2021-08-18 15:15:06 +08:00 |
|
|
yuezhihang
|
af1ffe9313
|
解读入库
|
2021-08-18 14:44:27 +08:00 |
|
|
yuezhihang
|
39561c91d2
|
代码部分恢复
|
2021-08-18 14:38:00 +08:00 |
|
|
super_liu
|
5251cfdb71
|
Merge branch 'develop_master' into develop_3
|
2021-08-18 14:00:03 +08:00 |
|
|
super_liu
|
5767a26a6a
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-18 13:57:48 +08:00 |
|
|
yanyizhou
|
9e0aad737c
|
限制
|
2021-08-18 13:46:45 +08:00 |
|
|
super_liu
|
8e0e632c35
|
feat: There is no way the
|
2021-08-18 13:46:11 +08:00 |
|
|
super_liu
|
3906456daa
|
feat: There is no way the auth menu
|
2021-08-18 13:00:46 +08:00 |
|
|
super_liu
|
bc955be3df
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-18 10:16:48 +08:00 |
|
|
super_liu
|
8b465f93bf
|
feat: There is no way the
|
2021-08-18 10:16:32 +08:00 |
|
|
2510220824
|
43a72ca794
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-18 09:36:48 +08:00 |
|
|
2510220824
|
a45045f61c
|
add:重置mq配置
|
2021-08-18 09:35:41 +08:00 |
|
|
yanyizhou
|
79a6ac3b4c
|
commit
|
2021-08-18 09:22:11 +08:00 |
|
|
yanyizhou
|
35877cd941
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
|
2021-08-17 20:11:35 +08:00 |
|
|
yuezhihang
|
f353328bce
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-17 17:51:44 +08:00 |
|
|
yuezhihang
|
7303f11043
|
解读入库
|
2021-08-17 17:51:38 +08:00 |
|
|
super_liu
|
f7231deef7
|
feat: There is no way the
|
2021-08-17 17:36:44 +08:00 |
|
|
yuezhihang
|
8028002033
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-17 16:18:45 +08:00 |
|
|
yuezhihang
|
535c4f47c4
|
清单！！！
|
2021-08-17 16:18:38 +08:00 |
|
|
2510220824
|
67adf4145a
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-17 16:16:33 +08:00 |
|
|
2510220824
|
7b28ebb23c
|
add:ocr配置
|
2021-08-17 16:15:51 +08:00 |
|
|
super_liu
|
1791877be5
|
feat: There is no way the
|
2021-08-17 15:04:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8181d2f024
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-17 14:09:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e6908fb48c
|
标准分解单 分页
|
2021-08-17 14:09:06 +08:00 |
|
|
super_liu
|
ecde4434dd
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !113
|
2021-08-17 02:48:55 +00:00 |
|
|
super_liu
|
8db9e0bccf
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-17 10:47:49 +08:00 |
|
|
super_liu
|
dbb69c8676
|
feat: There is no way the
|
2021-08-17 10:47:27 +08:00 |
|
|
yuezhihang
|
0529b40897
|
试图上传
|
2021-08-17 09:50:23 +08:00 |
|
|
yuezhihang
|
690d86a4b8
|
项目查询以及代码精简
|
2021-08-17 09:37:46 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
68d7a1ab66
|
添加了注释
|
2021-08-16 16:16:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1acf15280e
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-16 16:13:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
32626f3ae1
|
过内外标准高级搜索
|
2021-08-16 16:13:04 +08:00 |
|
|
yuezhihang
|
fbefe71f1c
|
评估结果
|
2021-08-16 15:43:26 +08:00 |
|
|
yuezhihang
|
86db5270e4
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-16 15:12:54 +08:00 |
|