Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 02a3b6cc55 判空bug CD 2022-11-04 19:07:59 +08:00
• 3bb6e45f23 bug CD 2022-11-04 16:27:09 +08:00
• 2fbdb94c34 Merge branch 'develop_master' into FOTON liyawei 2022-11-03 18:53:33 +08:00
• 2e2525d68e bug修改 liyawei 2022-11-03 18:49:01 +08:00
• 53b2adbf50 log修改 CD 2022-11-02 13:34:21 +08:00
• d9d21a51c4 校验bug CD 2022-11-01 10:04:20 +08:00
• 2883eb1418 Merge branch 'develop_master' into FOTON zyd 2022-10-26 22:47:10 +08:00
• fa99114ce1 fix: 修复BUG zhangyanduan 2022-10-26 16:54:05 +08:00
• 1037f112ee Merge remote-tracking branch 'origin/develop_master' into develop_master liyawei 2022-10-25 12:43:59 +08:00
• c2c50b4352 操作日志-部门显示修改 liyawei 2022-10-25 12:43:20 +08:00
• b9afd7ff0c Merge branch 'develop_master' into FOTON zyd 2022-10-24 22:32:24 +08:00
• 5a01009cf8 Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zyd 2022-10-24 22:31:08 +08:00
• 9e60b22671 修改企标复审入库流程：非修订时才修改文本状态 liyawei 2022-10-24 20:19:09 +08:00
• b20d14a562 修改企标复审入库流程：修订时才生成企标计划 liyawei 2022-10-24 17:48:05 +08:00
• 991c299c10 fix: 修复BUG zyd 2022-10-24 16:10:01 +08:00
• 8c01b11d18 fix:修复再处理被代替标准号数据补全时，数据补充错误导致无法更新状态的BUG zyd 2022-10-24 11:04:46 +08:00
• 5f1b490954 fix:增加日志输出以及输出的内容 zhangyanduan 2022-10-21 10:20:06 +08:00
• 979f1631fc Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zhangyanduan 2022-10-21 09:47:15 +08:00
• 9542200d13 fix: 新增手动启动定时任务接口 zhangyanduan 2022-10-21 09:47:06 +08:00
• 73945de1cf 适用车型为空会出现bug CD 2022-10-20 21:27:01 +08:00
• 14c3354739 Merge branch 'develop_master' into FOTON zhangyanduan 2022-10-20 17:26:24 +08:00
• 04749fd69d Merge remote-tracking branch 'origin/develop_master' into develop_master CD 2022-10-20 14:13:53 +08:00
• fe37063ba4 日志 CD 2022-10-20 14:13:27 +08:00
• 768c64e209 Merge branch 'develop_master' into FOTON zyd 2022-10-19 22:14:32 +08:00
• 7fc50fb4e0 资料中心查询去重 liyawei 2022-10-18 09:42:06 +08:00
• 2246c96ce0 Merge remote-tracking branch 'origin/develop_master' into develop_master CD 2022-10-17 17:25:43 +08:00
• 0a491e93f8 分数是空字符串的bug CD 2022-10-17 17:25:23 +08:00
• b038ac6f3d 添加:角色管理配置资料中心权限功能 liyawei 2022-10-17 16:03:50 +08:00
• 0ebdd2f435 解决: 企标制修订立项计划流程，程结束之后，查看计划库归档，立项单填写的内容没有归档 liyawei 2022-10-14 15:08:17 +08:00
• 01986f8b1c Merge remote-tracking branch 'origin/develop_master' into develop_master CD 2022-10-14 10:46:46 +08:00
• 8edad2bcd3 企标计划 CD 2022-10-14 10:46:20 +08:00
• 730a3e153f Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zhangyanduan 2022-10-13 18:09:32 +08:00
• 12635bbdc4 fix: 修复文件检查错误的BUG zhangyanduan 2022-10-13 18:09:17 +08:00
• bb8021122e 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 liyawei 2022-10-13 14:57:51 +08:00
• 61e8851ebf 企标制修订-技术标准流程,起草单位高级经理审核节点，导出意见 liyawei 2022-10-13 13:51:54 +08:00
• 91e26a51c5 fix: 修复代码错误 zhangyanduan 2022-10-13 11:06:15 +08:00
• 3f1e3f71aa 重置索引 zhangjun 2022-10-13 09:28:38 +08:00
• d0e7a5f96f Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-10-13 09:03:12 +08:00
• 452ed1920b add:解决加密文件问题 zyd 2022-10-13 00:53:48 +08:00
• 65b66cc38c fix: 修复BUG zyd 2022-10-12 23:52:39 +08:00
• d67bfea609 Merge branch 'develop_master' into FOTON zyd 2022-10-12 23:44:28 +08:00
• d6771eabe1 fix: 修复BUG zyd 2022-10-12 23:43:55 +08:00
• f96370df40 Merge branch 'develop_master' into FOTON zyd 2022-10-12 23:10:47 +08:00
• 3c89f8bdbd add: 更新swagger接口配置参数 zyd 2022-10-12 23:10:35 +08:00
• 522e1e1416 Merge branch 'develop_master' into FOTON zyd 2022-10-12 23:00:26 +08:00
• c266ddc4a1 add:检查文件是否为加密文件的判断代码逻辑 zyd 2022-10-12 22:58:48 +08:00
• 8f74bbfbd9 删除索引信息 zhangjun 2022-10-12 12:09:05 +08:00
• 5e4ca83210 Merge branch 'develop_master' into FOTON zyd 2022-10-11 22:51:55 +08:00
• 5f6fa80e16 搜索中心同步删除 zhangjun 2022-10-11 14:59:52 +08:00
• 376cc3bab9 搜索中心同步删除 zhangjun 2022-10-11 14:59:52 +08:00
• 9793e7bb65 Merge branch 'develop_master' into FOTON zyd 2022-10-10 21:47:01 +08:00
• bd93dc1d44 fix:提交未同步到生产环境得表结构 zhangyanduan 2022-10-10 17:15:53 +08:00
• 585b7d6b75 fix:修复企标体系数据挂靠目录关系逻辑优化 zhangyanduan 2022-10-10 16:37:21 +08:00
• af42065586 Merge branch 'develop_master' into FOTON zyd 2022-10-09 23:06:55 +08:00
• f8775844d3 国内外企标添加移动标准功能 liyawei 2022-10-09 20:41:59 +08:00
• 74e856d6d5 国内外企标添加移动标准功能 liyawei 2022-10-09 18:38:12 +08:00
• b174191045 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-10-08 17:42:21 +08:00
• 3f5515b77b sql 不想删了，暂时保留，这个是前端bug，只需去掉control层代码即可 zhangjun 2022-09-29 16:56:13 +08:00
• 36c94e2aaf fix: 修复导入模板时按照上传解密后的文件进行解析 zhangyanduan 2022-10-08 13:54:05 +08:00
• 3d924b4cfb Merge remote-tracking branch 'origin/FOTON' into FOTON zhangjun 2022-10-08 09:02:21 +08:00
• 4017583752 搜索中心日志 zhangjun 2022-10-08 09:01:14 +08:00
• 6702be7464 Merge branch 'develop_master' into FOTON zyd 2022-10-01 19:08:24 +08:00
• 8a77f17b43 update:自启动定时任务增加参数主机管控 zyd 2022-10-01 19:08:12 +08:00
• 72e59f25a7 Merge branch 'develop_master' into FOTON zyd 2022-10-01 18:21:41 +08:00
• d4e592e21f 添加定时任务 ip 字段 zhangjun 2022-09-29 16:56:13 +08:00
• 03ab40bbe1 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-09-30 17:34:05 +08:00
• 8ff7b4b8ac fix: 错误日志全部输出到日志文件中 zyd 2022-09-30 02:08:40 +08:00
• 42274fb6b0 修改搜索中心添加并查询资源类型、能源类型 zhangjun 2022-09-29 17:00:42 +08:00
• 83cbe979bb Merge branch 'develop_master' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_master zhangyanduan 2022-09-29 17:14:05 +08:00
• 822437e364 fix: 修复搜索中心颜色显示 zhangyanduan 2022-09-29 17:13:53 +08:00
• 326c3f1cc9 修改搜索中心添加并查询资源类型、能源类型 zhangjun 2022-09-29 17:00:42 +08:00
• 761727e63c 修改搜索中心添加并查询资源类型、能源类型 zhangjun 2022-09-29 16:56:13 +08:00
• d105dce3a5 标准预警模块导出excel缺少条款内容 zhangjun 2022-09-29 15:00:09 +08:00
• 97f12bdef1 代替标准号超链接打不开 zhangjun 2022-09-29 14:40:03 +08:00
• bc0d3a878a 修改搜索中心添加并查询资源类型、能源类型 zhangjun 2022-09-29 14:13:32 +08:00
• fd855adfc3 修改搜索中心添加并查询资源类型、能源类型 zhangjun 2022-09-29 14:13:32 +08:00
• 6bc2bfadb0 修改搜索中心重构后出现问题 zhangjun 2022-09-29 13:09:41 +08:00
• 06ebf1d3fc 修改搜索中心重构后出现问题 zhangjun 2022-09-29 13:09:41 +08:00
• 42c8e7e100 fix: 优化代码中的废弃逻辑以及名称标记 zhangyanduan 2022-09-29 09:17:06 +08:00
• e6ab230f88 fix:修复国内标准中GB和非GB类在自动变更状态时查询逻辑错误的BUG zyd 2022-09-28 22:35:37 +08:00
• 78376b2598 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-09-28 15:39:15 +08:00
• 107a58b857 修改删除企标树结构，但是这块逻辑不明白，暂时不修改，防止引起更多问题 zhangjun 2022-09-28 15:38:55 +08:00
• 12c93f4a21 项目合规评估流程，责任人填写评估反馈添加条款内容 liyawei 2022-09-28 14:27:57 +08:00
• 3ef12b62bf 项目合规评估流程，责任人填写评估反馈添加条款内容 liyawei 2022-09-28 12:12:20 +08:00
• 80c7602e11 模块结构单元变型号 zhangjun 2022-09-28 10:04:35 +08:00
• 9722851ada 标准征求意见流程，意见处理节点添加来源，导出 liyawei 2022-09-28 09:21:36 +08:00
• 950c78575b 自动启动项目 zhangjun 2022-09-27 16:16:22 +08:00
• 1e60718574 启动项目 zhangjun 2022-09-27 15:53:27 +08:00
• a26274ac9c 适用车辆显示问题 zhangjun 2022-09-27 14:54:31 +08:00
• 556166090c 预警删除之前的信息 zhangjun 2022-09-27 14:27:33 +08:00
• 11eee9ec03 查看分解单报错 zhangjun 2022-09-27 10:59:57 +08:00
• fd887d10fd 修改搜索中心排序问题 zhangjun 2022-09-26 17:37:12 +08:00
• a460bdb05b Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-09-26 17:38:41 +08:00
• c68e00e466 修改搜索中心排序问题 zhangjun 2022-09-26 17:37:12 +08:00
• a08b8cdc41 标准预警查看 zhangjun 2022-09-26 13:38:35 +08:00
• 1b36e1b6a1 查询分解单适用车型 zhangjun 2022-09-26 13:31:34 +08:00
• 3c5d366595 项目清单确认流程，点击添加标准，添加查询条件“适用认证” zhangjun 2022-09-26 10:48:53 +08:00
• 76145920ee 制修订流程-产品标准，修订，流程结束之后，企标库没有新增 zhangjun 2022-09-26 10:24:42 +08:00
• 9cd13bb880 制修订流程跑完入库报错了，流程没问题 zhangjun 2022-09-23 15:28:28 +08:00
• 25766202f4 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-09-22 20:36:16 +08:00