 gaojiabao
|
c038fae038
|
企业编号 最大值 加1 以及新增时，企标名称可以重复（编号和名称重复也是新增一条，不做覆盖）
|
2023-04-04 11:44:31 +08:00 |
|
|
gaojiabao
|
9415f29898
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 10:37:15 +08:00 |
|
|
gaojiabao
|
5cd7e4310b
|
企业编号 最大值 加1
|
2023-04-04 10:25:33 +08:00 |
|
|
高嵩
|
9eb62c3c65
|
Merge branch 'master' into 'dev_20230216'
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
|
2023-04-04 09:35:34 +08:00 |
|
|
SUNJIABIN
|
46a977bd0c
|
优化企标导入
|
2023-04-04 09:32:54 +08:00 |
|
|
gaojiabao
|
47af72dcf3
|
拆分导入
|
2023-04-03 21:13:27 +08:00 |
|
|
gaojiabao
|
4f71a4c971
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-03 21:11:50 +08:00 |
|
|
gaojiabao
|
d3c152f5b4
|
拆分导入
|
2023-04-03 21:11:11 +08:00 |
|
|
SUNJIABIN
|
5d7c299c23
|
优化企业标准导入功能和模板下载功能
|
2023-04-03 21:07:21 +08:00 |
|
|
SUNJIABIN
|
f796716536
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-03 19:37:40 +08:00 |
|
|
SUNJIABIN
|
295dcdcce5
|
新增白名单api
|
2023-04-03 19:37:33 +08:00 |
|
|
gaojiabao
|
c52c720884
|
问答中心回答
|
2023-04-03 13:36:50 +08:00 |
|
|
gaojiabao
|
6d6edd5d43
|
问答中心回答
|
2023-04-03 11:19:04 +08:00 |
|
|
SUNJIABIN
|
3e5b30f9ab
|
修改企业标准导入逻辑，如果是否有效状态是无效可以导入同名的企标编号或企标名称
|
2023-03-31 17:15:55 +08:00 |
|
|
gaojiabao
|
f6731e85bd
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-31 15:40:45 +08:00 |
|
|
gaojiabao
|
733c7c14f5
|
问答中心回答
|
2023-03-31 15:40:28 +08:00 |
|
|
SUNJIABIN
|
09fe1bd309
|
优化企业标准导入
|
2023-03-31 15:36:11 +08:00 |
|
|
SUNJIABIN
|
bf25adf6b7
|
优化导入模板下载样式
|
2023-03-31 15:02:57 +08:00 |
|
|
SUNJIABIN
|
882f9d74d4
|
优化企业标准
|
2023-03-31 10:08:53 +08:00 |
|
|
SUNJIABIN
|
9ced17f361
|
优化企标导入校验
|
2023-03-31 09:54:38 +08:00 |
|
|
SUNJIABIN
|
862f1ea3d5
|
优化企业标准导入
|
2023-03-31 09:25:11 +08:00 |
|
|
SUNJIABIN
|
7932c3d986
|
企业标准导入优化
|
2023-03-31 00:27:07 +08:00 |
|
|
SUNJIABIN
|
4bc7957261
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-30 20:43:23 +08:00 |
|
|
SUNJIABIN
|
5ad13178ff
|
优化企标导入
|
2023-03-30 20:43:09 +08:00 |
|
|
gaojiabao
|
f47c1273da
|
首页 接收任务 按钮 点击则隐藏
|
2023-03-30 19:43:13 +08:00 |
|
|
gaojiabao
|
ca11f4ea51
|
拆分表格角标
|
2023-03-30 19:12:06 +08:00 |
|
|
gaojiabao
|
0c9f2fb867
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-30 19:07:30 +08:00 |
|
|
gaojiabao
|
4a18c684fa
|
拆分表格角标修正
|
2023-03-30 19:07:03 +08:00 |
|
|
SUNJIABIN
|
fc3704555a
|
优化企标导入
|
2023-03-30 16:47:43 +08:00 |
|
|
SUNJIABIN
|
fd2d8bbc57
|
优化企业导入流程和新增模板下载接口
|
2023-03-30 15:36:23 +08:00 |
|
|
SUNJIABIN
|
6bddbb8e77
|
优化企标导入功能
|
2023-03-29 19:51:51 +08:00 |
|
|
高嵩
|
2ca755d253
|
合并分支 'dev_20230216' 到 'master'
优化企标导入
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!28
|
2023-03-28 18:23:07 +08:00 |
|
|
SUNJIABIN
|
fdbd2a3336
|
优化企标导入
|
2023-03-28 18:18:41 +08:00 |
|
|
高嵩
|
3d05df1055
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!27
|
2023-03-27 18:14:08 +08:00 |
|
|
gaojiabao
|
bfea9a313d
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-27 18:13:43 +08:00 |
|
|
gaojiabao
|
484d2879e4
|
人员表修改
|
2023-03-27 11:31:58 +08:00 |
|
|
高嵩
|
98cc554faa
|
Merge remote-tracking branch 'origin/dev_20230216'
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
# adc-da-activiti/src/main/java/com/adc/da/FeignClientImpl/workFlowFeignClientImpl.java
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
|
2023-03-26 16:53:41 +08:00 |
|
|
高嵩
|
6a683aed12
|
合并分支 'dev_chaifen_20230322' 到 'master'
Dev chaifen 20230322
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!25
|
2023-03-26 16:42:19 +08:00 |
|
|
SUNJIABIN
|
2434fc3f05
|
国内外校验优化
|
2023-03-26 13:06:24 +08:00 |
|
|
gaojiabao
|
72b7568c2e
|
OA三天后撤销
|
2023-03-26 12:59:43 +08:00 |
|
|
gaojiabao
|
02a4b8a6d7
|
OA三天后撤销
|
2023-03-26 10:16:30 +08:00 |
|
|
gaojiabao
|
04c780243c
|
企业标准产品标准附件重复问题
|
2023-03-24 17:54:41 +08:00 |
|
|
gaojiabao
|
dcc3eb755b
|
Merge remote-tracking branch 'origin/dev_chaifen_20230322' into dev_chaifen_20230322
|
2023-03-23 13:54:34 +08:00 |
|
|
gaojiabao
|
b4410694f1
|
OA强制删除
|
2023-03-23 13:54:18 +08:00 |
|
|
SUNJIABIN
|
e03515e3ea
|
原文译文增加logger日志
|
2023-03-23 13:38:18 +08:00 |
|
|
SUNJIABIN
|
8a8097de89
|
原文译文增加logger日志
|
2023-03-23 09:36:41 +08:00 |
|
|
gaojiabao
|
2732f5c505
|
英译文件修改和无法处理数据进行返回（公众号和文件id）
|
2023-03-22 18:07:19 +08:00 |
|
|
gaojiabao
|
4d9b3c22ca
|
英译文件修改和无法处理数据进行返回（公众号和文件id）
|
2023-03-22 16:12:25 +08:00 |
|
|
gaojiabao
|
19d7befd82
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-22 13:50:15 +08:00 |
|
|
gaojiabao
|
23659c18a7
|
企标制修订计划管控 （接收任务）
|
2023-03-22 13:49:55 +08:00 |
|