FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,068 Commits 1 Branch 0 Tags
524b880cf3fa91a2a8ff2d136f9a47479220199f
Commit Graph
3068 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
SUNJIABIN 5490ac34ca 优化企标导入多选 2023-04-04 22:23:53 +08:00
SUNJIABIN baaed76784 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-04 21:33:44 +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
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
高嵩 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