Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 0bee1e9cf7 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-27 16:51:43 +08:00
• 5e8b70c41e 国家地区清单关联之后查询 出现多条重复标准挂载 问题修复 yuezhihang 2021-12-27 16:51:35 +08:00
• ccfa63fc2a Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-27 16:34:49 +08:00
• 424b84a7fb Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-27 16:34:21 +08:00
• 575a50a399 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-27 16:14:57 +08:00
• cdffdad6ad 标准导出字典转换 zhaokaiyao@91isoft.com 2021-12-27 16:07:29 +08:00
• c41a19a1ab 企标制修订计划查询失效bug修复 yuezhihang 2021-12-27 15:46:11 +08:00
• 840b426adc 采标程度连表查询 yuezhihang 2021-12-27 15:38:25 +08:00
• f2d8482eeb 企标制修订计划入库 yuezhihang 2021-12-27 15:26:15 +08:00
• 6f455ea0f1 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-27 11:15:59 +08:00
• 78bd7e1bde 清单导出缺少数据 应该只在国家地区清单出现！已修复 yuezhihang 2021-12-27 11:01:45 +08:00
• b450d1486c Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-25 16:47:58 +08:00
• c7b0affb87 计划库新增字段及逻辑 yuezhihang 2021-12-25 16:47:50 +08:00
• 057ce691d6 标准导出字典转换 zhaokaiyao@91isoft.com 2021-12-25 13:40:41 +08:00
• 2c9ea4b182 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-25 09:33:39 +08:00
• 56c7b5d98e Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-25 09:33:25 +08:00
• 8c491a7dd8 Merge branch 'develop_3' into 'FOTON' 王夏晖 2021-12-25 09:33:08 +08:00
• f999a8fd77 合规评估查询失效bug修复 yuezhihang 2021-12-24 17:07:29 +08:00
• ea777f2c3e Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-24 15:23:04 +08:00
• d9996eeac2 预警性能 不使用转列改为使用正则 zhaokaiyao@91isoft.com 2021-12-24 15:22:37 +08:00
• 1115c81244 未符合项查询 yuezhihang 2021-12-24 11:12:04 +08:00
• afc6ab860c Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-24 10:31:02 +08:00
• c29a0070df Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-24 09:50:03 +08:00
• 93d6af7d66 会议信息修改bug修复 yuezhihang 2021-12-24 09:49:52 +08:00
• b33c643622 未符合项基础模块-->历史数据查询失效bug修复 yuezhihang 2021-12-24 09:49:21 +08:00
• 49e0469818 Merge branch 'develop_master' into FOTON super_liu 2021-12-23 22:04:22 +08:00
• 60c4957bcb Merge branch 'develop_3' into 'develop_master' super_liu 2021-12-23 22:03:17 +08:00
• 2bd9e7f323 查询总数 zhaokaiyao@91isoft.com 2021-12-23 16:11:36 +08:00
• 0e904d7b53 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-23 15:06:57 +08:00
• d1cf56c660 标准比对导出表格和标准比对导出图片 yuezhihang 2021-12-23 15:05:32 +08:00
• 5c0756fcbf 注释 zhaokaiyao@91isoft.com 2021-12-23 14:23:38 +08:00
• cb471942cb 标准比对导出bug修复 + 法规清单查询修复 yuezhihang 2021-12-23 14:20:25 +08:00
• d412036280 资料中心添加字段 dataExplain zhaokaiyao@91isoft.com 2021-12-23 14:02:53 +08:00
• ce45170582 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-23 10:45:59 +08:00
• dcd7ec0bd8 国家地区清单 才拿xccssrqgj 其他拿xccssrq yuezhihang 2021-12-23 10:45:51 +08:00
• c9e08a1fb5 国内外日期查询 总数错误 zhaokaiyao@91isoft.com 2021-12-22 20:34:40 +08:00
• 69f6708e56 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-22 19:24:56 +08:00
• 7d6a2be540 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-12-22 19:24:29 +08:00
• d99b9cfc7c Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-22 19:23:48 +08:00
• 59319f0a27 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-12-22 17:59:20 +08:00
• dd8d2e2151 分解单编辑功能 yanyizhou 2021-12-22 17:59:07 +08:00
• 6df2b5a7d3 国内外标准代替标准号查询 zhaokaiyao@91isoft.com 2021-12-22 17:50:23 +08:00
• 8d52744eb7 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-22 16:54:11 +08:00
• b0b6a6f391 会议信息修改bug修复 yuezhihang 2021-12-22 16:24:10 +08:00
• f8c9ab1d55 Merge remote-tracking branch 'origin/develop_master' into develop_1 yanyizhou 2021-12-22 15:09:05 +08:00
• 5f5051bd2f 未符合项bug修复 --->新增支持查询责任部门 yuezhihang 2021-12-22 14:03:11 +08:00
• 8c72debb05 责任部门导出和日历修改 bug修复 yuezhihang 2021-12-22 11:09:20 +08:00
• a79b7cbb2f Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-21 20:48:33 +08:00
• 5e1df05c6b Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-21 20:42:18 +08:00
• 22cc39c0e2 标准化活动参会入会 yuezhihang 2021-12-21 20:42:06 +08:00
• 223008e42b Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-21 17:21:08 +08:00
• 8b225fbb14 feat: There is no way the, super_liu 2021-12-21 17:01:48 +08:00
• 75d89f16d7 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-21 15:23:35 +08:00
• 8ef5e27843 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-21 14:41:06 +08:00
• 382f42b8e5 feat: There is no way the, super_liu 2021-12-21 14:39:06 +08:00
• 66afce65a4 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-21 14:15:07 +08:00
• 1d2fcd4a27 项目清单查询 yuezhihang 2021-12-21 14:13:44 +08:00
• 3b0feb046d Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-21 11:06:46 +08:00
• 3880e0c68f 标准维度选数据出现全空数据的问题 yuezhihang 2021-12-21 11:05:26 +08:00
• caed5e20a3 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-21 10:13:01 +08:00
• d05f5eb388 法规清单人名回显问题 yuezhihang 2021-12-21 10:12:55 +08:00
• 4bc1c92df8 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-20 20:29:41 +08:00
• 999f277c13 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-20 20:28:58 +08:00
• 1432bdb520 预警 zhaokaiyao@91isoft.com 2021-12-20 20:26:51 +08:00
• 820bc2c519 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-20 20:25:35 +08:00
• e8b84b3088 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-20 18:04:02 +08:00
• 9d365878a0 标准维度流程 yuezhihang 2021-12-20 18:03:51 +08:00
• ca115ff337 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-20 17:03:03 +08:00
• 28e5923544 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-20 17:02:18 +08:00
• ab3e3374b8 企标评价空指针 zhaokaiyao@91isoft.com 2021-12-20 15:42:30 +08:00
• 09e7e2ffee 标准查询没有total问题修复 yuezhihang 2021-12-20 13:51:57 +08:00
• 56212b7beb Merge branch 'develop_master' into FOTON super_liu 2021-12-18 13:59:23 +08:00
• 545e5bba72 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-18 13:56:14 +08:00
• 57b19f5c79 feat: There is no way the, iphone super_liu 2021-12-18 13:55:17 +08:00
• e114b10ac5 feat: There is no way the, del only callback code super_liu 2021-12-17 16:46:07 +08:00
• ce40aed7cb 企标制修订计划模块 yuezhihang 2021-12-17 16:24:40 +08:00
• 20877855aa 国内外 发布日期查询 zhaokaiyao@91isoft.com 2021-12-17 16:11:37 +08:00
• e491589af9 为符合项导出的excel 忽略productId zhaokaiyao@91isoft.com 2021-12-17 15:12:58 +08:00
• 9856f73052 清单导出--》字段问题修复 yuezhihang 2021-12-17 15:02:02 +08:00
• 904d7a993d 为符合项导出的excel 计划关闭时间去掉时分秒 zhaokaiyao@91isoft.com 2021-12-17 14:50:28 +08:00
• efe197eb12 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-17 11:26:51 +08:00
• 204a2c8225 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-17 11:16:12 +08:00
• 773e33988e 征求意见流程--》导出功能完善 yuezhihang 2021-12-17 11:16:02 +08:00
• d282250b1a Merge remote-tracking branch 'origin/FOTON' into FOTON zj 2021-12-17 10:56:43 +08:00
• a8544607de 高级搜索 发布日期范围查询 zhaokaiyao@91isoft.com 2021-12-17 10:55:44 +08:00
• 2302a13901 解决冲突 zj 2021-12-17 10:55:36 +08:00
• f5b42efb71 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-17 10:53:33 +08:00
• 62bb294f09 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-17 10:53:16 +08:00
• 4166e2cc64 Merge remote-tracking branch 'origin/FOTON' into FOTON zj 2021-12-17 10:52:11 +08:00
• 0983c5b741 Merge branch 'develop_3' into 'FOTON' 王夏晖 2021-12-17 10:50:00 +08:00
• 4f18df878c Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-16 20:49:46 +08:00
• 3bf802fd75 国内外删除提示 zhaokaiyao@91isoft.com 2021-12-16 20:47:45 +08:00
• 9c6df264d6 Merge branch 'develop_master' into FOTON super_liu 2021-12-16 20:17:58 +08:00
• ddbedc1b28 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-16 18:18:40 +08:00
• 90d6c0d4cf feat: There is no way the, super_liu 2021-12-16 18:13:17 +08:00
• 391169aeea 公开征求意见部分 的导出接口预备 以及 流程中上传附件数据预备 （后端自测完成 有数据回显需要前台从流程开始更改传输数据） yuezhihang 2021-12-16 18:07:54 +08:00
• 71354b944f 资料中心通过id查询 zhaokaiyao@91isoft.com 2021-12-16 17:43:00 +08:00
• e0f4eb3d0f 国内外查询总数的sql zhaokaiyao@91isoft.com 2021-12-16 17:42:17 +08:00
• 349c283db4 登陆人或责任人部门错误问题 已修复 （可能存在残留） yuezhihang 2021-12-16 16:56:53 +08:00
• a5e00ef286 公开征求意见以及流程部分功能修复 yuezhihang 2021-12-16 15:33:21 +08:00