FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,780 Commits 1 Branch 0 Tags
3bd285aacdc0f82a7140851a93e7a2e9cd437708
Commit Graph
63 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Mr.Z 0eecf9f3bc Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-11-09 14:53:28 +08:00
Mr.Z 6ac3dfe9b3 资料中心管理相关 2021-11-09 14:52:51 +08:00
Mr.Z a15d20a8be 标准合规评估结果小眼睛查询章节号排序(新增需求根据项目名称排序) 2021-10-09 14:49:28 +08:00
Mr.Z bcc12aeb95 标准合规评估结果小眼睛查询章节号排序初改 2021-10-09 09:31:16 +08:00
Mr.Z aa5e7004dc Merge remote-tracking branch 'origin/develop_master' into develop_1 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
 2021-09-28 10:52:29 +08:00
Mr.Z 04a07687c6 标准法规清单查询 2021-09-27 17:11:07 +08:00
Mr.Z 0630c99b0b 添加条款内容传给前端 2021-09-27 16:33:59 +08:00
Mr.Z 35f49e1528 导出排序（按照章节号从小到大） 2021-09-27 09:43:27 +08:00
Mr.Z 108b718091 导出排序（按照章节号从小到大） 2021-09-26 17:50:48 +08:00
Mr.Z 9b47219f07 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-26 17:33:47 +08:00
Mr.Z b064503b3c 导出排序（按照章节号从小到大） 2021-09-26 17:33:16 +08:00
Mr.Z 22027d9e7c Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-26 13:48:47 +08:00
Mr.Z 8e2d3c7697 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-23 14:00:35 +08:00
Mr.Z 2b9b039a48 拉取master 2021-09-22 16:52:13 +08:00
Mr.Z 8c749b2f84 拉取master 2021-09-22 16:51:02 +08:00
Mr.Z e777d18044 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-22 09:45:04 +08:00
Mr.Z e8d901bb2f 分解单搜索问题~ 2021-09-16 20:11:23 +08:00
Mr.Z ba7dd33176 未符合项整改库标准号/标准名称搜索~ 2021-09-14 17:40:11 +08:00
Mr.Z 84190c9ddc 项目合规评估流程-项目 入到标准合规评估结果 里面 产品线、项目编号、项目名称没传值~~ 2021-09-07 16:55:28 +08:00
Mr.Z 04dc576644 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:31:28 +08:00
Mr.Z 5d56dd4151 岗位管理新增查询功能以及分页功能~~ 2021-09-07 09:29:23 +08:00
Mr.Z ff66ad5fbf Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-09-07 09:25:02 +08:00
Mr.Z a88178f1c1 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-06 08:57:47 +08:00
Mr.Z c48c311d3c 车型项目库的清单版本时间格式修改~~ 2021-09-04 11:22:37 +08:00
Mr.Z 0e8238267c 车型项目库的清单版本~~ 2021-09-02 17:29:19 +08:00
Mr.Z 7d0c3a3a9a Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-09-02 16:49:29 +08:00
Mr.Z 2e6edf615b 标准预警修改~~ 2021-09-02 10:17:28 +08:00
Mr.Z 4204771472 标准预警初次修改~~ 2021-08-31 14:03:26 +08:00
Mr.Z af428949a8 之前被覆盖的修改二次提交(；′⌒`)~~ 2021-08-27 17:33:06 +08:00
Mr.Z 349fa7e499 标准拆分的批量删除与编辑~~ 2021-08-27 15:30:24 +08:00
Mr.Z baa674136b 征求意见流程导出bug修改~~ 2021-08-27 15:30:24 +08:00
Mr.Z cf60309f2b 标准预警标准编号与名称跳页~~ 2021-08-27 11:26:32 +08:00
Mr.Z 8cf4fec559 标准预警标准编号与名称跳页~~ 2021-08-27 11:25:17 +08:00
Mr.Z 05994c6014 标准预警标准编号与名称跳页~~ 2021-08-27 11:24:27 +08:00
Mr.Z 07bd24b7cf 标准拆分的批量删除与编辑~~ 2021-08-26 20:44:51 +08:00
Mr.Z 4eb9e91554 Merge branch 'develop_master' into develop_1 2021-08-26 11:15:54 +08:00
Mr.Z 6ada02e26d Merge branch 'develop_master' into develop_1 2021-08-26 10:27:59 +08:00
Mr.Z a828f41d20 征求意见流程导出bug修改~~ 2021-08-25 15:16:14 +08:00
Mr.Z c65edcbaab 成球意见详情导出格式bug修改~~ 2021-08-24 15:30:43 +08:00
Mr.Z 3d9952df59 Merge branch 'develop_master' into develop_1 2021-08-24 11:05:07 +08:00
Mr.Z 6e9cf7adf4 车型项目库数据传递bug修改~~ 2021-08-24 11:01:32 +08:00
Mr.Z eb264da8f6 合并DM到D1~~~~ 2021-08-23 15:03:04 +08:00
Mr.Z d94b03b05a 车型项目库回显bug(T_T)~~~~ 2021-08-23 14:46:09 +08:00
Mr.Z 2b8b536811 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-23 13:37:48 +08:00
Mr.Z ed0909c6ff Merge branch 'develop_master' into develop_1 2021-08-20 09:37:57 +08:00
Mr.Z dd6b2e76f9 之前的bug重新提交(T_T)~~~~ 2021-08-18 16:19:40 +08:00
Mr.Z 241d14bac4 标准合规评估流程 项目评估结果后台查询bug~~~~ 2021-08-16 15:01:03 +08:00
Mr.Z bfc9995aad Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 18:06:14 +08:00
Mr.Z 26ffa2d7af 标准合规评估流程 字段修改 2021-08-12 18:02:28 +08:00
Mr.Z 0325b6b7ee Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-12 09:48:53 +08:00
Mr.Z f3285453bf Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-08-12 09:42:35 +08:00
Mr.Z db5ea125fb Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-11 23:06:47 +08:00
Mr.Z 1374bc5807 zyh自用 2021-08-11 23:03:40 +08:00
Mr.Z 9773e51ef0 添加字段条款名称 2021-08-10 18:34:16 +08:00
Mr.Z 5cb1fd52cc 分解单字段修改 2021-08-10 17:29:07 +08:00
Mr.Z 6058cc036c 标准合规评估结果-技术评估结果 回显不正确 2021-08-08 14:04:29 +08:00
Mr.Z f8e0ce0be1 标准征求意见流程--导出汇总单，修正存在一条数据的情况下，导出的数据应该在excel列表的第二行，目前在第三行 2021-08-08 10:17:38 +08:00
Mr.Z 29240d6db5 标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误 2021-08-06 15:20:18 +08:00
Mr.Z 19dc409742 标准征求意见流程--导出汇总单，修正存在一条数据的情况下，导出的数据应该在excel列表的第二行，目前在第三行 2021-08-05 14:01:10 +08:00
Mr.Z 6eb0ed526e 标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误 2021-08-04 20:09:44 +08:00
Mr.Z 967cdeab35 Merge remote-tracking branch 'origin/develop_master' into develop_1 2021-08-04 15:15:55 +08:00
Mr.Z 4993e03aa1 未符合项整改，标准号/标准名称查询错误 2021-08-03 15:49:34 +08:00
Mr.Z c458d52eef 修改数据库sar_stand_unqualified表中STAND_SERIAL_NUMBER字段的额外空格 2021-07-30 11:13:12 +08:00