 SUNJIABIN
|
5263b6fd6b
|
增加拆分导入白名单
|
2023-04-06 09:38:10 +08:00 |
|
|
高嵩
|
52cb08f6a6
|
制定和修订类型 清除历史版本
|
2023-04-06 04:56:44 +08:00 |
|
|
高嵩
|
76fe9d8d61
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!40
|
2023-04-06 04:48:04 +08:00 |
|
|
高嵩
|
680c77dd5b
|
制定和修订类型 清除历史版本
|
2023-04-06 04:11:11 +08:00 |
|
|
gaojiabao
|
a7dafb3cf8
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-06 03:44:49 +08:00 |
|
|
gaojiabao
|
d5d1884d38
|
问答中心 msg 没有值
|
2023-04-06 03:44:12 +08:00 |
|
|
高嵩
|
a5d1f0c695
|
合并分支 'dev_20230216' 到 'master'
优化企标导入起草人
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!39
|
2023-04-06 01:48:51 +08:00 |
|
|
SUNJIABIN
|
291604a9bf
|
优化企标导入起草人
|
2023-04-06 01:45:03 +08:00 |
|
|
高嵩
|
4342ba8fa5
|
合并分支 'dev_20230216' 到 'master'
优化提示音
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!38
|
2023-04-06 00:33:21 +08:00 |
|
|
SUNJIABIN
|
022e0c0755
|
优化提示音
|
2023-04-06 00:02:32 +08:00 |
|
|
高嵩
|
be51af2bbb
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!37
|
2023-04-05 23:43:21 +08:00 |
|
|
gaojiabao
|
a14d158480
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-05 23:43:00 +08:00 |
|
|
gaojiabao
|
8d6a79801c
|
导入拆分结果
|
2023-04-05 23:42:40 +08:00 |
|
|
高嵩
|
edc9a39657
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-05 23:42:32 +08:00 |
|
|
高嵩
|
d6713f578f
|
修改最大顺序号问题
|
2023-04-05 23:42:13 +08:00 |
|
|
gaojiabao
|
01635ca7c7
|
定时任务
|
2023-04-05 22:14:41 +08:00 |
|
|
gaojiabao
|
7c747782ca
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-05 15:08:27 +08:00 |
|
|
gaojiabao
|
a34f14d52f
|
名称优化
|
2023-04-05 15:08:04 +08:00 |
|
|
SUNJIABIN
|
1273b380f2
|
优化企业标准导入增加对Excel文档重复编号和名称的校验
|
2023-04-05 14:20:41 +08:00 |
|
|
高嵩
|
acb9175db3
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!36
|
2023-04-04 23:42:50 +08:00 |
|
|
SUNJIABIN
|
1bbc5df6c7
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 23:38:45 +08:00 |
|
|
SUNJIABIN
|
4f02559c1a
|
增加对入库时的校验
|
2023-04-04 23:38:39 +08:00 |
|
|
gaojiabao
|
c9708f03f5
|
在线编辑文件的路径
|
2023-04-04 23:33:19 +08:00 |
|
|
gaojiabao
|
524b880cf3
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 22:59:53 +08:00 |
|
|
gaojiabao
|
659358908e
|
标准拆分 分页文本状态 nulL
|
2023-04-04 22:59:07 +08:00 |
|
|
高嵩
|
1e98ed85de
|
合并分支 'dev_20230216' 到 'master'
优化企标导入多选
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!35
|
2023-04-04 22:24:35 +08:00 |
|
|
SUNJIABIN
|
5490ac34ca
|
优化企标导入多选
|
2023-04-04 22:23:53 +08:00 |
|
|
高嵩
|
d8d0e82980
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!34
|
2023-04-04 21:42:10 +08:00 |
|
|
SUNJIABIN
|
baaed76784
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 21:33:44 +08:00 |
|
|
高嵩
|
31e66529c5
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!31
|
2023-04-04 21:33:19 +08:00 |
|
|
SUNJIABIN
|
8f05e19188
|
优化企标导入新增多选需求
|
2023-04-04 21:32:50 +08:00 |
|
|
gaojiabao
|
602db8cac3
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 21:32:13 +08:00 |
|
|
gaojiabao
|
c4535f9b12
|
导入拆分结果
|
2023-04-04 21:31:15 +08:00 |
|
|
高嵩
|
bded4f1341
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!30
|
2023-04-04 19:38:44 +08:00 |
|
|
SUNJIABIN
|
a74737ccb6
|
优化企标导入
|
2023-04-04 19:33:49 +08:00 |
|
|
SUNJIABIN
|
0ab1974ead
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 18:27:55 +08:00 |
|
|
SUNJIABIN
|
87fcf9e4b3
|
临时提交
|
2023-04-04 18:27:48 +08:00 |
|
|
gaojiabao
|
c8c55a839b
|
通过id查询接口
|
2023-04-04 17:44:55 +08:00 |
|
|
gaojiabao
|
50b7f6632e
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-04-04 15:37:11 +08:00 |
|
|
gaojiabao
|
7aa1c4a80c
|
标准详情的问答返回所有问题和回答
|
2023-04-04 15:36:56 +08:00 |
|
|
SUNJIABIN
|
77cd84c8e2
|
企标计划名称重复问题
|
2023-04-04 13:20:05 +08:00 |
|
|
SUNJIABIN
|
4de795c255
|
企业标准导入优化及调整
|
2023-04-04 13:10:52 +08:00 |
|
|
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 |
|
|
高嵩
|
fa59fd0aa8
|
合并分支 'dev_20230216' 到 'master'
Dev 20230216
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!29
|
2023-04-04 09:35:54 +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 |
|