Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 0197e1b17f Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-07 20:13:41 +08:00
• a018459ad1 评分 zhaokaiyao@91isoft.com 2021-12-07 17:46:12 +08:00
• 3da2c21cd9 拆分标准 复制修复 --->对应bug为无法删除 yuezhihang 2021-12-07 17:33:15 +08:00
• 01b503fda5 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-07 15:20:05 +08:00
• 1edd95bccc Ocr部分bug 和工作组部分bug修复 yuezhihang 2021-12-07 15:19:55 +08:00
• de2e2977a9 评分历史 创建时间和修改时间 zhaokaiyao@91isoft.com 2021-12-07 09:59:02 +08:00
• 39ffe69442 登录接口新增字段 上一级部门 id和名称 yuezhihang 2021-12-06 17:05:37 +08:00
• 95642b0166 登陆接口 新增返回字段-----部门id 和 部门名称 yuezhihang 2021-12-06 15:39:10 +08:00
• 0ce4df7252 未符合项整改加排序 yuezhihang 2021-12-06 14:51:25 +08:00
• 995891757d 补充上一版本 yuezhihang 2021-12-06 09:47:48 +08:00
• 4478fecf73 项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题 yuezhihang 2021-12-06 09:45:36 +08:00
• 0e68e431ea 为符合项 排序 yuezhihang 2021-12-05 20:25:49 +08:00
• 7f5fdbd321 删除草稿接口 api/lawss/activiti/delCG yuezhihang 2021-12-05 15:50:46 +08:00
• a501f87a68 项目清单加字段 ！ 白名单添加一个导出 yuezhihang 2021-12-05 15:09:19 +08:00
• 17feda6305 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-06 18:12:38 +08:00
• 359a384c70 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-06 18:11:09 +08:00
• a2d002d659 ocr回到附件名称斜杠转换，避免造成路径读取错误 zj 2021-12-06 18:06:28 +08:00
• 8d211a52c2 评分表 zhaokaiyao@91isoft.com 2021-12-06 18:03:49 +08:00
• 82aa2a1139 登录接口新增字段 上一级部门 id和名称 yuezhihang 2021-12-06 17:05:37 +08:00
• 58cbe73a09 登陆接口 新增返回字段-----部门id 和 部门名称 yuezhihang 2021-12-06 15:39:10 +08:00
• 6b3d87c890 未符合项整改加排序 yuezhihang 2021-12-06 14:51:25 +08:00
• 3e877d48fe 去除多选日期时分秒 zhaokaiyao@91isoft.com 2021-12-06 14:06:20 +08:00
• 5df6ea6c73 补充上一版本 yuezhihang 2021-12-06 09:47:48 +08:00
• 830f259792 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-06 09:45:45 +08:00
• 3a952eea82 项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题 yuezhihang 2021-12-06 09:45:36 +08:00
• 445d172e62 Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-05 21:08:42 +08:00
• ffde83f71e Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-05 21:08:16 +08:00
• 691e7b6bcc 更新法规是否纳入法规清单 zhaokaiyao@91isoft.com 2021-12-05 20:56:32 +08:00
• 02edc0ba2e 为符合项 排序 yuezhihang 2021-12-05 20:25:49 +08:00
• 8ae7ed4dd9 企标评分 zhaokaiyao@91isoft.com 2021-12-05 20:23:21 +08:00
• 7cd3262d3f 预警排序 zhaokaiyao@91isoft.com 2021-12-05 19:57:27 +08:00
• 492a5e9622 海外标准号查询 zhaokaiyao@91isoft.com 2021-12-05 19:55:40 +08:00
• a1fee557af 预警导出 zhaokaiyao@91isoft.com 2021-12-05 18:42:51 +08:00
• 51e67d4440 删除草稿接口 api/lawss/activiti/delCG yuezhihang 2021-12-05 15:50:46 +08:00
• 7f88babb5f 项目清单加字段 ！ 白名单添加一个导出 yuezhihang 2021-12-05 15:09:19 +08:00
• 2d1b55fa76 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-05 09:46:16 +08:00
• fb04c67b17 企标评分 zhaokaiyao@91isoft.com 2021-12-05 09:43:31 +08:00
• 505be3cdc9 企标制修订计划模块 半重构o(*￣︶￣*)o yuezhihang 2021-12-03 14:48:31 +08:00
• dab0c3db12 leo liao 2021-12-03 11:29:49 +08:00
• 618516a7cd Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-02 21:16:45 +08:00
• c1e1f8a495 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-02 21:16:11 +08:00
• 41ad39f343 Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-12-02 19:36:06 +08:00
• 235f81b35c 标准号搜索框可以搜索标准名称 标准名称搜索框可以搜索标准号 zhaokaiyao@91isoft.com 2021-12-02 17:24:37 +08:00
• a7206afc5d 预警 标准实施日期子表 zhaokaiyao@91isoft.com 2021-12-02 16:24:40 +08:00
• a0924c6893 Merge branch 'origin/Three' into 'develop_master' 王夏晖 2021-12-02 10:49:56 +08:00
• 542433742b Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-02 10:25:18 +08:00
• 0569a33350 评估结果查看 yuezhihang 2021-12-02 10:25:10 +08:00
• 90d92b4a16 zcr:链接图标文件流 张超然 2021-12-02 10:18:04 +08:00
• d77dd97b2d Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-01 20:55:00 +08:00
• e7302f306d Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-12-01 20:54:21 +08:00
• 737c0dd65b Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-12-01 20:53:15 +08:00
• fbca49f8e9 预警 标准名称查询 zhaokaiyao@91isoft.com 2021-12-01 20:11:23 +08:00
• 852bdf5f77 预警 查询 zhaokaiyao@91isoft.com 2021-12-01 19:47:05 +08:00
• db899732c3 预警 定时任务 zhaokaiyao@91isoft.com 2021-12-01 19:11:11 +08:00
• 3e48e5f4f5 预警 定时任务 zhaokaiyao@91isoft.com 2021-12-01 19:11:01 +08:00
• 960ea90b4a 预警 定时任务 zhaokaiyao@91isoft.com 2021-12-01 19:08:59 +08:00
• 90d84a7443 模块结构单元 zhaokaiyao@91isoft.com 2021-12-01 19:00:55 +08:00
• 895289a1a0 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-12-01 17:59:23 +08:00
• 455fc2ba0e 12.1bug修复 yuezhihang 2021-12-01 17:59:17 +08:00
• f76e0aabe5 取消事务 zhaokaiyao@91isoft.com 2021-12-01 16:49:45 +08:00
• 535a4c392d Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-01 15:42:25 +08:00
• c27beedaa2 feat: There is no way the, buss sort Superman_Main 2021-12-01 15:41:11 +08:00
• 234e4aa036 预警定时任务 zhaokaiyao@91isoft.com 2021-12-01 15:31:50 +08:00
• 04c35a2751 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-12-01 14:22:48 +08:00
• 7078179608 feat: There is no way the, Superman_Main 2021-12-01 13:42:39 +08:00
• e89725a2f7 预警区间 zhaokaiyao@91isoft.com 2021-12-01 11:28:23 +08:00
• 03b8e3ee67 预警区间 zhaokaiyao@91isoft.com 2021-12-01 11:27:34 +08:00
• 1973529a69 取消预警 zhaokaiyao@91isoft.com 2021-12-01 11:27:07 +08:00
• d977214a56 预警查询 zhaokaiyao@91isoft.com 2021-12-01 11:25:56 +08:00
• 27fa76d77c Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-11-30 22:50:29 +08:00
• bc4529bf03 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-11-30 22:49:46 +08:00
• cd86b4a30c vpps查询第一层目录 zhaokaiyao@91isoft.com 2021-11-30 21:08:21 +08:00
• b43cc664e2 //todo zhaokaiyao@91isoft.com 2021-11-30 20:27:54 +08:00
• 25d8f1bdf7 重点问题跟踪新增判断是否重复 zhaokaiyao@91isoft.com 2021-11-30 20:26:53 +08:00
• cd33a3b4bb Merge branch 'develop_master' into 'FOTON' 王夏晖 2021-11-30 19:10:29 +08:00
• 878bc07e61 Merge branch 'develop_3' into 'develop_master' 王夏晖 2021-11-30 19:09:28 +08:00
• da97a60716 国家地区清单查询 zhaokaiyao@91isoft.com 2021-11-30 17:40:28 +08:00
• 0b2f4b917f Merge branch 'develop_master' into origin/Three 张超然 2021-11-30 09:25:34 +08:00
• 519ac979ad Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-11-29 22:47:10 +08:00
• 56c94ac3d6 ssrq为空时显示空 zhaokaiyao@91isoft.com 2021-11-29 22:46:51 +08:00
• 94497e6d5e Merge remote-tracking branch 'origin/FOTON' into FOTON_RELEASE 2510220824 2021-11-29 22:35:01 +08:00
• 5c358d5570 update:ocr回调文件存储 2510220824 2021-11-29 22:34:31 +08:00
• 4842f06018 Merge branch 'develop_master' into FOTON Superman_Main 2021-11-29 22:23:01 +08:00
• 7371b18a52 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-11-29 16:15:20 +08:00
• 0d43dde5f6 feat: There is no way the, Superman_Main 2021-11-29 16:14:38 +08:00
• 3117af535b 定时标准预警(不推送) zhaokaiyao@91isoft.com 2021-11-29 14:15:44 +08:00
• 8753b1ab66 @TableField("del_flag") zhaokaiyao@91isoft.com 2021-11-29 14:15:01 +08:00
• ce7db2246d Merge branch 'develop_master' into FOTON Superman_Main 2021-11-28 16:58:29 +08:00
• 78da27b088 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-11-28 16:56:37 +08:00
• 1bc8b4dd4d feat: There is no way the, contrast Superman_Main 2021-11-28 16:54:36 +08:00
• 6a44415e85 标准日期多选 zhaokaiyao@91isoft.com 2021-11-28 12:22:43 +08:00
• 6cf002a489 Merge branch 'develop_master' into FOTON Superman_Main 2021-11-27 19:55:06 +08:00
• 7414e25be7 Merge branch 'develop_migration' into 'develop_master' super_liu 2021-11-27 19:52:36 +08:00
• 0b69fc9e65 Merge branch 'develop_master' into develop_migration Superman_Main 2021-11-27 19:51:44 +08:00
• 5c4f8108d7 feat: There is no way the, Superman_Main 2021-11-27 19:50:56 +08:00
• eeaf62845d Merge remote-tracking branch 'origin/develop_master' into develop_3 zhaokaiyao@91isoft.com 2021-11-27 14:14:40 +08:00
• 419f519430 关联模块 zhaokaiyao@91isoft.com 2021-11-27 14:14:18 +08:00
• c8fe351362 Merge branch 'develop_3' into 'develop_master' super_liu 2021-11-26 21:24:46 +08:00
• c209bb485c 关联模块 zhaokaiyao@91isoft.com 2021-11-26 20:29:21 +08:00
• 4c31f54a5e 11.26 项目维度 查询标准数据接口修改1 yuezhihang 2021-11-26 16:41:50 +08:00