 zzy
|
c4e563081a
|
update：回复配置文件
|
2021-07-22 17:04:55 +08:00 |
|
|
zzy
|
3cafbfbb6f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/dao/SarStandUnqualifiedDao.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandUnqualified/service/impl/SarStandUnqualifiedServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml
|
2021-07-22 16:25:23 +08:00 |
|
|
yuezhihang
|
2783e02b1e
|
链接新增bug 修复
|
2021-07-22 10:26:09 +08:00 |
|
|
Wanghong
|
1ad63eff70
|
默认变更列表
|
2021-07-21 16:02:50 +08:00 |
|
|
yuezhihang
|
7d890e7fcd
|
评估流程
|
2021-07-21 10:52:22 +08:00 |
|
|
duanwenbin
|
a2be968da5
|
提交分解单列表，增加筛选条件-根据国内外标准筛选 修改一个bug，拆分解单提交功能，报错后不让入库操作
|
2021-07-19 09:32:23 +08:00 |
|
|
yinglong zhang
|
8aed75a8f0
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-13 15:36:33 +08:00 |
|
|
yinglong zhang
|
35d86a7222
|
feat 未合规项整改
|
2021-07-13 15:36:17 +08:00 |
|
|
super_liu
|
b335387242
|
Merge branch 'develop_3' into 'develop_master'
feat: 标准库
See merge request !21
|
2021-07-11 07:49:10 +00:00 |
|
|
super_liu
|
43434a68e0
|
feat: 标准库
|
2021-07-11 15:47:02 +08:00 |
|
|
yinglong zhang
|
3b0fbb34d1
|
feat 改回注册中心配置
|
2021-07-09 11:05:46 +08:00 |
|
|
yuezhihang
|
4b8aac9bc4
|
标准 发布搞
|
2021-07-08 21:04:18 +08: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 |
|
|
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 |
|
|
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
|
773b75a3fe
|
feat 合并分支
|
2021-07-05 15:01:40 +08:00 |
|
|
super_liu
|
75a7a90e9d
|
Merge branch 'develop_master' into develop_3
|
2021-07-05 11:10:43 +08:00 |
|
|
yinglong zhang
|
531bb9e7ce
|
feat 合并分支
|
2021-07-04 16:41:37 +08:00 |
|
|
super_liu
|
006fb9a1f4
|
feat: 标准入库流程
|
2021-06-23 18:11:55 +08:00 |
|
|
super_liu
|
12d9bd7b51
|
feat: 标准入库
|
2021-06-22 18:07:08 +08:00 |
|
|
super_liu
|
c3f912eefb
|
feat: 流程入库 及 杂七杂八
|
2021-06-21 18:36:52 +08:00 |
|
|
super_liu
|
19c7a56d73
|
feat: 标准入库流程测试实例提交 及 项目token固定用户admin
|
2021-06-09 17:34:42 +08:00 |
|
|
super_liu
|
2b5164ddd3
|
feat: 添加子模块-工作流 集成相关配置
|
2021-06-08 22:23:40 +08:00 |
|