Commit Graph
100 Commits
Author SHA1 Message Date
396572590@qq.com 2a46d765c6 Merge branch 'develop_master' into FOTON 2022-08-19 17:31:11 +08:00
super_liu 4017e27243 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!578
2022-08-19 17:29:49 +08:00
396572590@qq.com 9d4609e749 Merge branch 'develop_master' into develop_migration 2022-08-19 17:28:57 +08:00
396572590@qq.com 2ef63ef875 feat: There is no way the, 自动更新状态 添加 更新LOG 2022-08-19 17:26:46 +08:00
396572590@qq.com 405fa26217 Merge branch 'develop_master' into FOTON 2022-08-19 10:02:10 +08:00
super_liu ce9736de6f Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!574
2022-08-17 17:42:21 +08:00
396572590@qq.com 0005b8aa6e feat: There is no way the, 56994 分接单手动关联之后条款顺序不对 2022-08-17 16:36:13 +08:00
396572590@qq.com 293f1f1471 feat: There is no way the, 56996 基础库的状态自动变更之后,没有log 2022-08-17 16:25:54 +08:00
super_liu 65a4124615 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!573
2022-08-17 11:18:14 +08:00
396572590@qq.com f14a6f2c62 feat: There is no way the, 首页征求意见 查询 2022-08-16 17:01:10 +08:00
396572590@qq.com 658d83e47e feat: There is no way the, 56968 引用标准1589跳转没改好 2022-08-12 14:16:41 +08:00
396572590@qq.com 7896a28126 Merge branch 'develop_master' into FOTON 2022-08-10 17:46:53 +08:00
super_liu dd1be531a5 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!572
2022-08-10 17:44:15 +08:00
396572590@qq.com fa4778b555 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 17:43:44 +08:00
396572590@qq.com 92eff43614 Merge branch 'develop_master' into FOTON 2022-08-10 17:00:57 +08:00
super_liu 179bc9e1e1 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!571
2022-08-10 16:56:45 +08:00
396572590@qq.com c86440eb96 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 16:55:50 +08:00
super_liu f508297e35 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改

See merge request LiuChao/foton-slrs-system-rest!570
2022-08-10 16:44:52 +08:00
396572590@qq.com 43c59e13e5 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 2022-08-10 16:26:36 +08:00
super_liu 2cd8f5e5fe Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!569
2022-08-08 17:36:34 +08:00
396572590@qq.com b792f585a4 feat: There is no way the, 2022-08-08 16:49:23 +08:00
super_liu 96f8ee33b3 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!568
2022-08-04 16:11:38 +08:00
396572590@qq.com 67c4a1afd9 feat: There is no way the, 56904 问答库-订阅 程序异常 api/lawss/Subscription/insertSubscription 这个接口 , 添加 取消订阅功能 2022-08-04 16:10:45 +08:00
396572590@qq.com 4e90dfa1cf feat: There is no way the, 56828 项目评估流程,选择项目页面,项目显示不全,只显示10条数据 2022-08-04 13:25:37 +08:00
super_liu 2703768e23 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56881 标准拆分-详情-模板下载,token无效 , 添加白名单

See merge request LiuChao/foton-slrs-system-rest!567
2022-08-03 16:02:21 +08:00
396572590@qq.com aacd522b79 feat: There is no way the, 56881 标准拆分-详情-模板下载,token无效 , 添加白名单 2022-08-03 15:50:00 +08:00
super_liu 0f8cb0b64e Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56827 标准合规评估流程-项目分发节点,选择项目逻辑 应该是“已维护”+“未维护”,现在查询的挺乱的

See merge request LiuChao/foton-slrs-system-rest!566
2022-08-02 18:02:36 +08:00
396572590@qq.com 69f44f6202 feat: There is no way the, 56827 标准合规评估流程-项目分发节点,选择项目逻辑 应该是“已维护”+“未维护”,现在查询的挺乱的 2022-08-02 18:01:56 +08:00
396572590@qq.com 9531c2643d feat: There is no way the, /data/slrs/system-server/logs 2022-08-01 15:28:41 +08:00
396572590@qq.com 0b211ffcd1 Merge branch 'develop_master' into FOTON 2022-08-01 11:06:27 +08:00
super_liu 2541c05176 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56812 新增的,走完流程后没有显示公开

See merge request LiuChao/foton-slrs-system-rest!565
2022-07-29 17:46:36 +08:00
396572590@qq.com 9c709c1ffa feat: There is no way the, 56812 新增的,走完流程后没有显示公开 2022-07-29 17:28:35 +08:00
396572590@qq.com 18e8cca200 feat: There is no way the, fk 2022-07-28 13:43:10 +08:00
396572590@qq.com a008d8cb4c Merge branch 'develop_master' into FOTON 2022-07-28 13:06:26 +08:00
super_liu 5075cd2daa Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  车身中心反馈说勾选下面的条件时,名称搜索搜不到

See merge request LiuChao/foton-slrs-system-rest!563
2022-07-28 10:36:18 +08:00
396572590@qq.com fdcdcfdd35 feat: There is no way the, 车身中心反馈说勾选下面的条件时,名称搜索搜不到 2022-07-28 10:35:10 +08:00
super_liu 3947a40673 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  体系的展示能否体现每一层,比如设计标准/电子电控/车联网系统  标准入库流程

See merge request LiuChao/foton-slrs-system-rest!562
2022-07-28 09:08:04 +08:00
396572590@qq.com 23248fce1d feat: There is no way the, 体系的展示能否体现每一层,比如设计标准/电子电控/车联网系统 标准入库流程 2022-07-27 15:34:17 +08:00
super_liu bbe979c149 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!561
2022-07-27 09:54:09 +08:00
396572590@qq.com 973d07f4d3 feat: There is no way the, 2022-07-27 09:53:07 +08:00
396572590@qq.com 63fc26299c Merge branch 'develop_master' into FOTON 2022-07-24 11:16:50 +08:00
super_liu 8954e11d93 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56624  国家地区清单的详情页面,标准号查询条件无作用

See merge request LiuChao/foton-slrs-system-rest!560
2022-07-21 15:53:46 +08:00
396572590@qq.com 29028fb4af feat: There is no way the, 56624 国家地区清单的详情页面,标准号查询条件无作用 2022-07-21 15:49:28 +08:00
396572590@qq.com 4f60f21e28 Merge branch 'develop_master' into FOTON 2022-07-21 11:36:01 +08:00
super_liu 3178d22a47 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56608 企业标准-企标复审计划,附件位置不支持名称搜索

See merge request LiuChao/foton-slrs-system-rest!559
2022-07-20 17:32:12 +08:00
396572590@qq.com 673b050757 feat: There is no way the, 56608 企业标准-企标复审计划,附件位置不支持名称搜索 2022-07-20 17:18:38 +08:00
super_liu 4d72c4f90c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!558
2022-07-19 18:08:03 +08:00
396572590@qq.com 17dd917d1e feat: There is no way the, 模块结构单元变型号(乘用车) 模块结构单元名称(乘用车) DOC 2022-07-19 18:07:38 +08:00
396572590@qq.com 53ccc5a913 feat: There is no way the, 标准入库 国内及海外标准法规
FBGYWBD
                                 发布稿(译文) 入库添加字段
2022-07-19 17:31:28 +08:00
396572590@qq.com fa06b6f2e4 Merge branch 'develop_master' into FOTON 2022-07-19 08:45:12 +08:00
super_liu 5d0678f71f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  56519 企标计划-编辑,引用标准显示null 删除后提交 再次点击还是显示null

See merge request LiuChao/foton-slrs-system-rest!557
2022-07-18 15:49:18 +08:00
396572590@qq.com 2d3f27bf17 feat: There is no way the, 56519 企标计划-编辑,引用标准显示null 删除后提交 再次点击还是显示null 2022-07-18 15:48:32 +08:00
396572590@qq.com 0282638d90 Merge branch 'develop_master' into FOTON 2022-07-18 11:06:13 +08:00
396572590@qq.com dd0da9abe6 Merge branch 'develop_master' into FOTON 2022-07-16 00:32:03 +08:00
super_liu 7fed13b896 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!556
2022-07-16 00:31:24 +08:00
396572590@qq.com 1effa2bbf7 feat: There is no way the, 工作流文件下载 2022-07-16 00:30:56 +08:00
396572590@qq.com 4cc7191312 Merge branch 'develop_master' into FOTON 2022-07-16 00:29:55 +08:00
super_liu 65b62da126 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!555
2022-07-16 00:27:52 +08:00
396572590@qq.com fa9284fe8b feat: There is no way the, 工作流文件下载 2022-07-16 00:23:20 +08:00
396572590@qq.com ec146c4275 Merge branch 'develop_master' into FOTON 2022-07-15 22:53:09 +08:00
super_liu 1e9779262f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  工作流文件下载

See merge request LiuChao/foton-slrs-system-rest!554
2022-07-15 22:26:17 +08:00
396572590@qq.com 1c7ead8867 feat: There is no way the, 工作流文件下载 2022-07-15 22:23:09 +08:00
super_liu 9c6a577320 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #56403 企标计划-查看 制修订类型显示错误

See merge request LiuChao/foton-slrs-system-rest!553
2022-07-15 18:05:06 +08:00
396572590@qq.com 1f29f48bc7 feat: There is no way the, #56403 企标计划-查看 制修订类型显示错误 2022-07-15 17:09:23 +08:00
396572590@qq.com d36ea87c1c Merge branch 'develop_master' into FOTON 2022-07-14 08:51:18 +08:00
396572590@qq.com 1924844c38 Merge branch 'develop_master' into FOTON 2022-07-13 17:16:52 +08:00
396572590@qq.com df3848e2a4 Merge branch 'develop_master' into FOTON 2022-07-12 17:02:59 +08:00
super_liu 8617abdcd6 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  ^

See merge request LiuChao/foton-slrs-system-rest!552
2022-07-12 16:57:59 +08:00
396572590@qq.com 86f5e09232 feat: There is no way the, ^ 2022-07-12 16:53:51 +08:00
396572590@qq.com 053b615552 Merge branch 'develop_master' into FOTON 2022-07-12 11:55:53 +08:00
super_liu 3dd1dec40a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  #56326 #56321

See merge request LiuChao/foton-slrs-system-rest!551
2022-07-06 16:21:01 +08:00
396572590@qq.com ec259147db feat: There is no way the, #56326 #56321 2022-07-06 16:20:20 +08:00
super_liu 3b48e7cff8 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!550
2022-07-06 16:09:43 +08:00
396572590@qq.com 2ff17e8b27 feat: There is no way the, 自动更新废止 2022-07-06 15:59:50 +08:00
396572590@qq.com e14f4530f5 feat: There is no way the, #56326 #56321 2022-07-05 18:03:14 +08:00
super_liu 98d049af2f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #55969 #55973 企标顺序号相关逻辑

See merge request LiuChao/foton-slrs-system-rest!549
2022-07-03 18:04:18 +08:00
396572590@qq.com 8b70a4c80d feat: There is no way the, #55969 #55973 企标顺序号相关逻辑 2022-07-03 18:02:57 +08:00
super_liu 58fa98fe3a Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  企标顺序号关联逻辑

See merge request LiuChao/foton-slrs-system-rest!548
2022-07-02 22:41:27 +08:00
396572590@qq.com 4131965f6e feat: There is no way the, 企标顺序号关联逻辑 2022-07-02 22:34:04 +08:00
super_liu 36d7838206 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, bug #56143 企标相关-- 选择人员后带入的起草责任单位支持三级查询

See merge request LiuChao/foton-slrs-system-rest!547
2022-07-01 14:47:57 +08:00
396572590@qq.com 83b806c932 feat: There is no way the, bug #56143 企标相关-- 选择人员后带入的起草责任单位支持三级查询 2022-07-01 14:38:34 +08:00
396572590@qq.com f76c667a4f Merge branch 'develop_master' into FOTON 2022-06-30 11:08:25 +08:00
super_liu f03c06e020 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!546
2022-06-30 09:54:18 +08:00
396572590@qq.com 19b4863d18 Merge branch 'develop_master' into develop_migration 2022-06-30 09:31:51 +08:00
396572590@qq.com 4d0a56be74 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 2022-06-29 15:37:25 +08:00
396572590@qq.com 20d23a427e feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多 改为测 2022-06-29 15:31:50 +08:00
396572590@qq.com accfc06de8 Merge branch 'develop_master' into FOTON 2022-06-29 11:57:28 +08:00
396572590@qq.com e42500f3c4 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 2022-06-28 18:14:53 +08:00
super_liu 4380b2af06 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,  改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完

See merge request LiuChao/foton-slrs-system-rest!543
2022-06-28 18:04:39 +08:00
396572590@qq.com dd0676c577 feat: There is no way the, UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据) 2022-06-28 18:04:17 +08:00
396572590@qq.com aa3bdac315 feat: There is no way the, 改改改 从企标计划开始 改到 企标标准入库及企标库 改至计划已确认关联之多…… 待改完 2022-06-28 17:55:40 +08:00
super_liu 3ec5d054f2 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据)

See merge request LiuChao/foton-slrs-system-rest!542
2022-06-28 14:35:51 +08:00
396572590@qq.com bd487d08ad feat: There is no way the, UPDNONEXISTENT_nameEn (只支持文本查询接口,维护ES 英文字段不存在的数据) 2022-06-28 14:35:06 +08:00
396572590@qq.com 467d19e5b2 Merge branch 'develop_master' into FOTON 2022-06-28 11:49:22 +08:00
super_liu d9b478ea63 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标编辑优化

See merge request LiuChao/foton-slrs-system-rest!541
2022-06-28 11:48:12 +08:00
396572590@qq.com 0ea7f77dba feat: There is no way the, 企标编辑优化 2022-06-28 11:47:03 +08:00
396572590@qq.com 3213e37979 Merge branch 'develop_master' into FOTON 2022-06-27 17:21:01 +08:00
super_liu fb0c1bbc61 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, #55761 8986的模糊查询,系统查询不到

See merge request LiuChao/foton-slrs-system-rest!540
2022-06-27 17:19:53 +08:00
396572590@qq.com fa2235a993 feat: There is no way the, #55761 8986的模糊查询,系统查询不到 2022-06-27 16:07:00 +08:00
super_liu b867799859 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, BUG #56065

See merge request LiuChao/foton-slrs-system-rest!539
2022-06-24 18:30:21 +08:00