Commit Graph
2869 Commits
Author SHA1 Message Date
liyawei 19d89cb73f Merge branch 'develop_master' into FOTON 2022-11-22 20:34:25 +08:00
liyawei e68ff9b658 车型项目数据添加日志 2022-11-22 20:03:57 +08:00
liyawei f805415536 174-接受任务回显 2022-11-22 15:07:48 +08:00
liyawei babad96a12 174-管控流程,批准节点获取企标计划ID修改 2022-11-21 19:48:04 +08:00
liyawei 4cd34c749b 174-OA待办修改 2022-11-21 17:39:02 +08:00
liyawei 96ca3ab453 174-删除企标计划和技术标准流程关联表 2022-11-21 14:12:03 +08:00
liyawei 66a7ea2ebd 174-手动新增企标计划 2022-11-21 14:07:20 +08:00
liyawei 960528457a 174-企标计划和技术标准流程关联表 2022-11-18 18:29:21 +08:00
liyawei 143719dccc 249-配置标准bug修改 2022-11-17 13:42:02 +08:00
liyawei d2ce68971f Merge branch 'develop_master' into FOTON 2022-11-15 21:36:24 +08:00
liyawei a41ec08f4f 合规评估-技术评估-查看bug修改 2022-11-15 21:06:43 +08:00
liyawei 402551005f 首页-添加资料中心列表 2022-11-14 13:47:45 +08:00
liyawei 249eef116e Merge branch 'develop_master' into FOTON 2022-11-10 18:24:18 +08:00
liyawei d51705e3bb 180,181-搜索中心bug修改 2022-11-10 17:09:48 +08:00
liyawei 5e9e111f49 Merge branch 'develop_master' into FOTON 2022-11-08 19:30:45 +08:00
liyawei 447fa61549 279-bug修改 2022-11-08 17:53:49 +08:00
liyawei e8d9117d90 279-bug修改 2022-11-08 14:55:29 +08:00
CD 82e9333ef6 222、223 bug 2022-11-08 14:30:48 +08:00
liyawei 20f76b5f83 275-bug修改 2022-11-07 17:47:34 +08:00
liyawei b8bfa39b88 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-11-07 16:40:53 +08:00
liyawei 07c8d1dcea 194-bug修改 2022-11-07 16:40:12 +08:00
CD 58e0240749 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-11-07 15:16:22 +08:00
CD d0542a79b1 标准合规评估流程 起草节点、项目分发节点分别对项目群跟项目增加名称的模糊匹配 2022-11-07 15:16:05 +08:00
liyawei 1403ca6b91 法规清单-归档后合规情况修改 2022-11-07 14:36:57 +08:00
CD 02a3b6cc55 判空bug 2022-11-04 19:07:59 +08:00
CD 3bb6e45f23 bug 2022-11-04 16:27:09 +08:00
liyawei 2fbdb94c34 Merge branch 'develop_master' into FOTON 2022-11-03 18:53:33 +08:00
liyawei 2e2525d68e bug修改 2022-11-03 18:49:01 +08:00
CD 53b2adbf50 log修改 2022-11-02 13:34:21 +08:00
CD d9d21a51c4 校验bug 2022-11-01 10:04:20 +08:00
zyd 2883eb1418 Merge branch 'develop_master' into FOTON 2022-10-26 22:47:10 +08:00
zhangyanduan fa99114ce1 fix: 修复BUG 2022-10-26 16:54:05 +08:00
liyawei 1037f112ee Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-25 12:43:59 +08:00
liyawei c2c50b4352 操作日志-部门显示修改 2022-10-25 12:43:20 +08:00
zyd b9afd7ff0c Merge branch 'develop_master' into FOTON 2022-10-24 22:32:24 +08:00
zyd 5a01009cf8 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-24 22:31:08 +08:00
liyawei 9e60b22671 修改企标复审入库流程:非修订时才修改文本状态 2022-10-24 20:19:09 +08:00
liyawei b20d14a562 修改企标复审入库流程:修订时才生成企标计划 2022-10-24 17:48:05 +08:00
zyd 991c299c10 fix: 修复BUG 2022-10-24 16:10:01 +08:00
zyd 8c01b11d18 fix:修复再处理被代替标准号数据补全时,数据补充错误导致无法更新状态的BUG 2022-10-24 11:04:46 +08:00
zhangyanduan 5f1b490954 fix:增加日志输出以及输出的内容 2022-10-21 10:20:06 +08:00
zhangyanduan 979f1631fc Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master 2022-10-21 09:47:15 +08:00
zhangyanduan 9542200d13 fix: 新增手动启动定时任务接口 2022-10-21 09:47:06 +08:00
CD 73945de1cf 适用车型为空会出现bug 2022-10-20 21:27:01 +08:00
zhangyanduan 14c3354739 Merge branch 'develop_master' into FOTON 2022-10-20 17:26:24 +08:00
CD 04749fd69d Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-20 14:13:53 +08:00
CD fe37063ba4 日志 2022-10-20 14:13:27 +08:00
zyd 768c64e209 Merge branch 'develop_master' into FOTON 2022-10-19 22:14:32 +08:00
liyawei 7fc50fb4e0 资料中心查询去重 2022-10-18 09:42:06 +08:00
CD 2246c96ce0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-10-17 17:25:43 +08:00