Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 967cdeab35 Merge remote-tracking branch 'origin/develop_master' into develop_1 Mr.Z 2021-08-04 15:15:55 +08:00
• b7f1016135 Merge remote-tracking branch 'origin/develop_1' into develop_1 yanyizhou 2021-08-04 09:58:36 +08:00
• 6f97155865 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-03 09:52:43 +00:00
• 3a19c44991 feat: 搜索中心 子项目 添加 相关依赖文件 及 修改 super_liu 2021-08-03 17:52:08 +08:00
• 1e1be015fe Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-03 07:50:29 +00:00
• 4993e03aa1 未符合项整改，标准号/标准名称查询错误 Mr.Z 2021-08-03 15:49:34 +08:00
• 17ba48200c Merge remote-tracking branch 'origin/develop_3' into develop_3 super_liu 2021-08-03 15:39:36 +08:00
• d46dbd5229 feat: 搜索中心 es 入库 国内外标准修改 super_liu 2021-08-03 15:39:12 +08:00
• 9a5117f8e8 标准 拆分加文本状态 Map对应的 酌情添加 yuezhihang 2021-08-03 15:06:20 +08:00
• 2f12561caf 本人意见显示在最上面 yuezhihang 2021-08-03 14:44:09 +08:00
• 294866bb1e 修复了标准拆分--拆分页面，该页面的数据回显重复的问题 zhaokaiyao@91isoft.com 2021-08-03 14:28:47 +08:00
• 6f654406fd 征求意见流程-----加按钮判断权限接口 yuezhihang 2021-08-03 13:56:33 +08:00
• 09e4a5a767 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-02 09:47:24 +00:00
• 4e398027eb feat: 国内外标准 编辑入es库 问题修改 super_liu 2021-08-02 17:44:16 +08:00
• 65f7689dbc 征求意见修改 yuezhihang 2021-08-02 15:17:44 +08:00
• cf6e3ae601 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-08-02 13:45:17 +08:00
• 2344ccfda2 Update application-dev.properties 王夏晖 2021-08-02 05:40:33 +00:00
• 4148f1bf6b Update application.properties 王夏晖 2021-08-02 05:38:46 +00:00
• b230a49783 Merge branch 'develop_3' into 'develop_master' super_liu 2021-08-02 03:07:45 +00:00
• d83c7359da feat: 非国内外标准菜单标准表 添加注解 super_liu 2021-08-02 10:58:59 +08:00
• bda7690807 最新 zhaokaiyao@91isoft.com 2021-07-31 22:29:40 +08:00
• a3729263a8 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-30 18:02:22 +08:00
• dd7f18f6d9 Merge remote-tracking branch 'origin/develop_1' into develop_1 zzy 2021-07-30 17:56:09 +08:00
• ed4dd5ae23 update：增加字段 zzy 2021-07-30 17:55:43 +08:00
• 43e37e3d47 修改未符合项字段显示bug Wanghong 2021-07-30 17:40:19 +08:00
• 0cbc935da1 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-30 09:19:22 +00:00
• 11b3e9f1c8 Merge remote-tracking branch 'origin/develop_master' into develop_1 zzy 2021-07-30 17:15:36 +08:00
• 30859dd3af update：develop3 zzy 2021-07-30 17:08:17 +08:00
• de95dc63ae Merge remote-tracking branch 'origin/develop_3' into develop_3 super_liu 2021-07-30 16:54:36 +08:00
• faef2cdf59 Update：标准解读流程检索 zzy 2021-07-30 16:45:23 +08:00
• 3c68a2a668 Merge remote-tracking branch 'origin/develop_3' into develop_1 zzy 2021-07-30 16:43:39 +08:00
• d7a2285d75 Revert "最新" zhaokaiyao@91isoft.com 2021-07-30 16:26:27 +08:00
• d71c4a81e1 Revert "修复了收藏后重新编辑数据,收藏的数据没有更新问题" zhaokaiyao@91isoft.com 2021-07-30 16:25:23 +08:00
• 343913c799 标准清单入库 bug修复 yuezhihang 2021-07-30 15:20:56 +08:00
• 46a577ab7f Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-30 13:43:13 +08:00
• f9ee8ca41c 角色配置数据权限 bug修复 和 角色新增配置初始权限bug修复 yuezhihang 2021-07-30 13:43:06 +08:00
• 9c9faf0ded Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-30 03:32:39 +00:00
• c458d52eef 修改数据库sar_stand_unqualified表中STAND_SERIAL_NUMBER字段的额外空格 Mr.Z 2021-07-30 11:13:12 +08:00
• 883cc97720 Update：标准解读流程新增实例 zzy 2021-07-30 11:00:36 +08:00
• 2e27eca0c2 update:解决车型项目库项目标准信息回显错误 zj 2021-07-30 10:04:53 +08:00
• 99321d38de 角色配置数据权限 bug修复 yuezhihang 2021-07-30 09:57:51 +08:00
• 589b31aa4d 注掉部分超哥代码 使程序先跑起来 yuezhihang 2021-07-30 09:32:24 +08:00
• 0d2ac245b2 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-30 01:01:28 +00:00
• 502e83de9d Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-29 16:55:10 +00:00
• 00894cbeef Merge branch 'develop_master' into develop_3 super_liu 2021-07-30 00:54:34 +08:00
• d7f3fc9f95 feat: 国内外标准 反向标准显示逻辑 super_liu 2021-07-30 00:48:48 +08:00
• dd281f63ad Update：清单高级检索 zzy 2021-07-29 16:59:25 +08:00
• 7d5fc79555 Merge remote-tracking branch 'origin/develop_1' into develop_1 zzy 2021-07-29 16:58:46 +08:00
• f9d39e5e2d 修改未符合项模糊查询bug Wanghong 2021-07-29 16:37:58 +08:00
• a40bada8ab 修改未符合项模糊查询bug Wanghong 2021-07-29 16:29:11 +08:00
• 502aff8539 修改未符合项字段bug Wanghong 2021-07-29 16:15:57 +08:00
• 72d954db68 修改未符合项字段bug Wanghong 2021-07-29 16:13:00 +08:00
• a017d3acd6 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-29 15:22:23 +08:00
• 534caf3bdb 政策状态修改 ！！！ 查询bug修复 yuezhihang 2021-07-29 15:21:53 +08:00
• 9d3d8e1198 Merge remote-tracking branch 'origin/develop_master' into develop_1 zzy 2021-07-29 15:19:39 +08:00
• 0779f2c8e9 update：未符合整改项导出 zzy 2021-07-29 15:07:07 +08:00
• 60dbb8faeb 配置中新 bug修复 和 角色管理bug修复 yuezhihang 2021-07-29 14:02:40 +08:00
• 80226d5cfb update：修改清单信息 zzy 2021-07-29 11:14:47 +08:00
• af1c3227f6 项目库 1 yuezhihang 2021-07-29 10:13:27 +08:00
• cabdf7a712 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-29 09:42:14 +08:00
• 5366e15b4b Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-29 09:39:42 +08:00
• a7c7142789 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-29 09:36:45 +08:00
• de1fe704a8 Update application-dev.properties 王夏晖 2021-07-28 14:25:50 +00:00
• cacc66d5e7 Merge remote-tracking branch 'origin/develop_1' into develop_1 Wanghong 2021-07-28 18:10:28 +08:00
• bf0f7b7f4c 修改未符合项模糊查询bug Wanghong 2021-07-28 18:09:44 +08:00
• a5d0229b5b Update application-dev.properties 王夏晖 2021-07-28 09:17:14 +00:00
• e434216c15 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-28 08:18:47 +00:00
• 474fe6fd45 feat: exist=false 国家属性字段 super_liu 2021-07-28 16:18:17 +08:00
• 31a14da9db Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-28 08:16:16 +00:00
• c9484a822f Merge remote-tracking branch 'origin/develop_3' into develop_3 super_liu 2021-07-28 16:15:07 +08:00
• 0b069efd95 feat: 国内外标准 多文档 操作 及 删除 国家属性字段 super_liu 2021-07-28 16:14:52 +08:00
• 734a4e7421 update:解决车型项目库项目标号回显错误的BUG zj 2021-07-28 15:55:53 +08:00
• 935a47d1f1 Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-07-28 15:36:42 +08:00
• de8f5631c0 add:升级es到7.6.2 2510220824 2021-07-28 15:35:45 +08:00
• 3adc08d178 水印取消工号内容 zhaokaiyao@91isoft.com 2021-07-28 15:30:48 +08:00
• a991f1550c Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-28 06:18:22 +00:00
• 6dc14af762 update：修改sql语句 zzy 2021-07-28 14:05:11 +08:00
• e237170f61 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-28 02:49:56 +00:00
• f862fbf2cd Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-28 10:45:28 +08:00
• b3630e8ad6 update：修复导出 zzy 2021-07-28 10:10:25 +08:00
• 2428b39e79 修改未符合项bug Wanghong 2021-07-28 09:23:44 +08:00
• b98c8291bd 水印添加了时间 zhaokaiyao@91isoft.com 2021-07-28 09:07:48 +08:00
• d990c840e4 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-27 12:35:22 +00:00
• f0fd398fee feat: 1 super_liu 2021-07-27 18:25:36 +08:00
• 66d54c3684 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-27 18:02:03 +08:00
• 9f82519e1c 最新 zhaokaiyao@91isoft.com 2021-07-27 18:01:28 +08:00
• 385870df42 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-27 09:30:09 +00:00
• 0540325f35 update：修改标准查询 zzy 2021-07-27 17:04:30 +08:00
• 7dbd402cb0 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-27 08:29:44 +00:00
• 01126cc1d4 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-27 16:24:24 +08:00
• 32afc5475f Revert "修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题" zhaokaiyao@91isoft.com 2021-07-27 16:18:58 +08:00
• f23df40628 update:车型项目库导出 zj 2021-07-27 15:55:51 +08:00
• 1007321491 update：标准征求意见增加字段 zzy 2021-07-27 15:55:01 +08:00
• d5ed912644 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-27 07:41:14 +00:00
• 75445cd9e1 feat: 实施日期格式 super_liu 2021-07-27 14:30:41 +08:00
• 9ff9bafcbf Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-27 03:20:17 +00:00
• 22f5ea5eaf feat: 修改updatePersonCollect接口 super_liu 2021-07-27 11:19:30 +08:00
• 5faa4d23b1 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-27 03:08:21 +00:00
• b182ad5885 最新 zhaokaiyao@91isoft.com 2021-07-27 11:05:42 +08:00
• 5bb3959002 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-27 10:43:17 +08:00