 高嵩
|
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 |
|
|
SUNJIABIN
|
1e23919f46
|
企标导入优化
|
2023-03-22 10:32:37 +08:00 |
|
|
gaojiabao
|
734342e0ad
|
变更表结构字段
|
2023-03-21 17:11:18 +08:00 |
|
|
gaojiabao
|
b4946c9ecc
|
校验优化
|
2023-03-20 16:27:55 +08:00 |
|
|
gaojiabao
|
994e4acbbb
|
校验优化
|
2023-03-20 16:10:40 +08:00 |
|
|
gaojiabao
|
98f2c05f32
|
校验优化
|
2023-03-20 15:59:02 +08:00 |
|
|
gaojiabao
|
17c526d396
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-20 09:20:23 +08:00 |
|
|
gaojiabao
|
59e8462d23
|
校验
|
2023-03-20 09:19:21 +08:00 |
|
|
gaojiabao
|
aa4451f0aa
|
校验
|
2023-03-17 18:03:27 +08:00 |
|
|
SUNJIABIN
|
cd61f6a2fb
|
企标导入和Result工具类优化
|
2023-03-17 13:51:32 +08:00 |
|
|
SUNJIABIN
|
c2b44c03a2
|
企标导入功能优化
|
2023-03-17 10:48:35 +08:00 |
|
|
SUNJIABIN
|
71f86a9635
|
企业标准导入功能
|
2023-03-16 16:56:59 +08:00 |
|
|
gaojiabao
|
b94f153b98
|
老系统重复文件查询
|
2023-03-16 09:11:44 +08:00 |
|
|
gaojiabao
|
0e28163281
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-16 09:02:57 +08:00 |
|
|
gaojiabao
|
5f466027b1
|
译文原文问题
|
2023-03-16 09:02:32 +08:00 |
|
|
SUNJIABIN
|
57e01dff10
|
我的收藏增加状态字段
|
2023-03-15 12:08:47 +08:00 |
|
|
SUNJIABIN
|
f44c8c1774
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-14 17:56:00 +08:00 |
|
|
SUNJIABIN
|
ef5d5889e1
|
企标导入功能和角色管理资料中心新增时权限问题
|
2023-03-14 17:55:34 +08:00 |
|
|
gaojiabao
|
d481985603
|
译文原文问题（校验）
|
2023-03-14 17:18:28 +08:00 |
|
|
gaojiabao
|
52134d926d
|
译文原文问题（更正老系统文件名称获取字段）
|
2023-03-14 14:17:45 +08:00 |
|
|
gaojiabao
|
cf570dbe6c
|
译文原文问题（返回文件有名称重复,代码优化）
|
2023-03-14 11:34:20 +08:00 |
|
|
gaojiabao
|
f398caa0eb
|
译文原文问题（返回文件有名称重复,代码优化）
|
2023-03-13 18:06:40 +08:00 |
|
|
gaojiabao
|
690373af7d
|
译文原文问题（返回文件有名称重复,代码优化）
|
2023-03-13 17:03:08 +08:00 |
|
|
gaojiabao
|
859326d2a3
|
译文原文问题（返回文件有名称重复,代码优化）
|
2023-03-13 15:07:20 +08:00 |
|
|
gaojiabao
|
4872a5a24a
|
译文原文问题（返回文件有名称重复,数据优化）
|
2023-03-13 14:49:40 +08:00 |
|
|
gaojiabao
|
99eb785b9d
|
译文原文问题（返回文件有名称重复）
|
2023-03-13 10:52:18 +08:00 |
|
|
gaojiabao
|
e13d97769d
|
清空注释代码
|
2023-03-10 17:25:04 +08:00 |
|
|
gaojiabao
|
8165d52946
|
英译 问题 + 老系统附件重复问题
|
2023-03-10 17:21:28 +08:00 |
|
|
gaojiabao
|
acc164f16d
|
英译
|
2023-03-10 10:31:28 +08:00 |
|
|
高嵩
|
ff6fa180ea
|
合并分支 'fix_foton_20230308' 到 'master'
企标技术标准历史版本文件问题
查看合并请求 laws-foton-slrs/foton-slrs-system-rest!24
|
2023-03-09 17:11:46 +08:00 |
|
|
gaojiabao
|
70171a5e79
|
文件下载 + 流程的历史版本问
|
2023-03-09 14:19:25 +08:00 |
|
|
SUNJIABIN
|
d6f41b63a8
|
企标技术标准历史版本文件问题
|
2023-03-09 14:13:58 +08:00 |
|
|
SUNJIABIN
|
9f8adf60cd
|
企业入库对标准号和名称校验
|
2023-03-08 16:00:09 +08:00 |
|
|
SUNJIABIN
|
f8161aa57f
|
Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
|
2023-03-07 15:38:01 +08:00 |
|