Commit Graph
3143 Commits
Author SHA1 Message Date
高嵩 85f3ebf281 合并分支 'dev_20230216' 到 'master'
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!48
2023-04-11 13:31:41 +08:00
SUNJIABIN cf1288984d Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-11 13:28:55 +08:00
SUNJIABIN 90cd1333e7 国内外校验优化 2023-04-11 13:28:50 +08:00
gaojiabao 3030bc9d68 问答中心 跳转回填提问和回答问题 2023-04-11 13:18:55 +08:00
gaojiabao 54e0ac3ce6 问答中心 跳转回填提问和回答问题 2023-04-11 13:09:58 +08:00
gaojiabao 96812f00f1 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-11 12:51:47 +08:00
gaojiabao 2b468f9149 问答中心 跳转回填提问和回答问题 2023-04-11 12:50:56 +08:00
SUNJIABIN 46851c9b6d 回答中心优化 2023-04-11 11:47:39 +08:00
高嵩 554c8d3ca6 合并分支 'dev_20230216' 到 'master'
回答中心优化

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!47
2023-04-11 11:03:36 +08:00
SUNJIABIN bb0f9a3949 回答中心优化 2023-04-11 11:01:18 +08:00
高嵩 ba759dbaca 合并分支 'dev_20230216' 到 'master'
问答中心 跳转回填提问和回答问题

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!46
2023-04-11 10:49:07 +08:00
gaojiabao 06e9c0a3e7 问答中心 跳转回填提问和回答问题 2023-04-11 10:47:53 +08:00
高嵩 01369f3592 合并分支 'dev_20230216' 到 'master'
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!45
2023-04-10 21:49:12 +08:00
SUNJIABIN 0ecf6a0acd Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-10 21:45:38 +08:00
SUNJIABIN bdbe9d12a4 拆分优化 2023-04-10 21:45:16 +08:00
gaojiabao d0113275ac Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-10 20:46:47 +08:00
高嵩 20222d02e5 合并分支 'dev_20230216' 到 'master'
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!44
2023-04-10 20:24:52 +08:00
SUNJIABIN c32f8c6cf4 问答中心增加校验,如果是提问人或回答人可看全部数据,如不是只能看归档数据 2023-04-10 20:22:35 +08:00
SUNJIABIN 97b086509a Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-10 16:48:33 +08:00
SUNJIABIN 983fa9a1f2 问答中心增加校验,如果是提问人或回答人可看全部数据,如不是只能看归档数据 2023-04-10 16:48:26 +08:00
gaojiabao 2b209fc4c8 单拆分个 2023-04-10 15:29:15 +08:00
gaojiabao f06df78def 单个拆分 2023-04-10 14:32:01 +08:00
gaojiabao 58fb851aaa 文件名称 2023-04-10 14:06:05 +08:00
gaojiabao 4e8bba5acb 文件回填 2023-04-10 13:53:59 +08:00
gaojiabao 27aba2ad1f 查询原文件 2023-04-09 20:40:35 +08:00
高嵩 5d1cba1036 合并分支 'dev_20230216' 到 'master'
批量流程

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!43
2023-04-09 18:23:42 +08:00
gaojiabao 346a68ce06 批量流程 2023-04-09 18:21:05 +08:00
高嵩 7d88c1a915 合并分支 'dev_20230216' 到 'master'
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!42
2023-04-09 18:11:29 +08:00
gaojiabao 8b72aec7bc Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java
#	adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsEODao.java
2023-04-09 18:04:05 +08:00
gaojiabao 463052ab89 企标计划批量走流程 2023-04-09 17:58:36 +08:00
SUNJIABIN 88601c0ac2 优化企标导入企标类别和企标编号中间空格问题 2023-04-07 23:25:18 +08:00
SUNJIABIN c58b5f1dea 删除重复接口 2023-04-07 22:24:57 +08:00
SUNJIABIN 6a3b7bb0a1 根据条款名称分页查询 2023-04-07 20:44:37 +08:00
SUNJIABIN 80263690cd 根据条款名称分页查询 2023-04-07 20:40:01 +08:00
SUNJIABIN 7c4dc14cc4 根据条款名称分页查询 2023-04-07 20:17:04 +08:00
SUNJIABIN a0829f5ede 优化拆分查询 2023-04-07 19:13:31 +08:00
gaojiabao 960fb4c422 提供前端 2023-04-07 18:46:05 +08:00
SUNJIABIN dc4fbe8131 国内外拆分查询 2023-04-07 18:07:21 +08:00
SUNJIABIN 3fe12077cb 企标计划新增成功返回优化 2023-04-07 12:47:35 +08:00
SUNJIABIN 740986eac7 企标入库时取消对企标实施时间为空校验 2023-04-07 11:27:46 +08:00
SUNJIABIN 878945698a 企标入库时增加对企标实施时间为空校验 2023-04-07 10:34:14 +08:00
高嵩 6c25d8958a 合并分支 'dev_20230216' 到 'master'
Dev 20230216

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!41
2023-04-06 12:33:04 +08:00
SUNJIABIN 8f83b8d5d3 企业标准更新校验优化 2023-04-06 12:00:08 +08:00
SUNJIABIN bf39ea028d 企标计划修改功能重复名称校验优化 2023-04-06 11:46:43 +08:00
SUNJIABIN 7e9095ee03 取消拆分导入白名单 2023-04-06 09:50:19 +08:00
SUNJIABIN 1dc522a461 Revert "增加拆分导入白名单"
This reverts commit 5263b6fd6b.
2023-04-06 09:49:56 +08:00
SUNJIABIN 2fb1dd8c43 取消拆分导入白名单 2023-04-06 09:49:12 +08:00
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