Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 8fd8a7541b Merge branch 'develop_master' into develop_3 super_liu 2021-07-27 10:41:10 +08:00
• b5a53bf905 feat: es MQ 全局判断 super_liu 2021-07-27 10:40:43 +08:00
• 387a97a46c feat: 树查询国内外标准 super_liu 2021-07-27 09:50:47 +08:00
• 1de5c838d0 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-27 09:34:43 +08:00
• ebedd9ee4c feat: 200 super_liu 2021-07-27 09:31:45 +08:00
• b3cc1704b2 feat: 200M 文件限制 super_liu 2021-07-27 09:26:09 +08:00
• b04e30f80d 修改了国外法规导出的excel表字段 zhaokaiyao@91isoft.com 2021-07-27 09:21:10 +08:00
• 9d4600b96c Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-27 09:20:28 +08:00
• c3c69e87ef update：清单增加字段 zzy 2021-07-27 09:20:27 +08:00
• 93f852fef4 Merge branch 'develop_master' into develop_3 super_liu 2021-07-27 09:08:54 +08:00
• 6f286d6ca5 Merge branch 'develop_1' into 'develop_master' super_liu 2021-07-27 00:58:31 +00:00
• f4c7b2ba68 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-26 20:12:12 +08:00
• 9cd93436c4 修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题 zhaokaiyao@91isoft.com 2021-07-26 20:07:38 +08:00
• 7e50bf88b0 Merge branch 'develop_master' into develop_3 super_liu 2021-07-26 18:31:43 +08:00
• 5a8cad6e09 feat: 国内外标准库 super_liu 2021-07-26 18:30:54 +08:00
• ad2b29f072 update：清单修改，时间查询 zzy 2021-07-26 17:57:44 +08:00
• bcb0106983 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-26 08:14:51 +00:00
• af86c48161 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-26 15:52:28 +08:00
• 404730d522 update：清单查询，增加字段 zzy 2021-07-26 14:53:51 +08:00
• cb48c13635 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-26 03:12:53 +00:00
• ccfbc541d5 feat: 企业标准库 迁移2 super_liu 2021-07-26 11:12:16 +08:00
• 6c4ad93812 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-26 10:10:24 +08:00
• 2a41643617 只在pdf中添加水印 zhaokaiyao@91isoft.com 2021-07-26 10:10:14 +08:00
• d210e218ba feat: 标准属性字段 默认排序 super_liu 2021-07-26 10:07:55 +08:00
• 923a3505bf Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-26 01:51:52 +00:00
• 2ba81296da feat: 标准库MQ super_liu 2021-07-26 09:51:12 +08:00
• c608e52226 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-25 12:50:49 +00:00
• 8a1c2b39c3 Merge remote-tracking branch 'origin/develop_3' into develop_3 super_liu 2021-07-25 20:44:40 +08:00
• 8a263964f6 feat: 企业标准库 迁移1 super_liu 2021-07-25 20:41:38 +08:00
• f609e3cece 恢复下载时添加水印接口 zhaokaiyao@91isoft.com 2021-07-25 18:22:41 +08:00
• 3154533fb8 修复了收藏后重新编辑数据,收藏的数据没有更新问题 优化逻辑,取消收藏时(逻辑删除),再次收藏此数据,由之前的添加一条新收藏的数据更改为更新原来数据的逻辑删除字段值 zhaokaiyao@91isoft.com 2021-07-25 16:51:59 +08:00
• a5286c3686 标准属性自定义在国外法规里新增字段 zhaokaiyao@91isoft.com 2021-07-25 16:46:36 +08:00
• f5ceeebbf6 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-24 01:49:13 +00:00
• cf0d9f6c6d 修改条件查询标准涉及项目符合性清单BUG Wanghong 2021-07-23 18:01:15 +08:00
• f94fb9db0d Merge remote-tracking branch 'origin/develop_1' into develop_1 Wanghong 2021-07-23 18:01:06 +08:00
• a4e2dd227a 修改条件查询标准涉及项目符合性清单BUG Wanghong 2021-07-23 18:00:24 +08:00
• 25528d92a8 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-23 08:03:18 +00:00
• 601799acf6 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-23 07:57:56 +00:00
• 1f57316d3e update：解决冲突 zzy 2021-07-23 15:56:56 +08:00
• 33c71b10e8 Merge remote-tracking branch 'origin/develop_1' into develop_1 zzy 2021-07-23 15:56:18 +08:00
• 84c8c949bb update:优化sql one more time zj 2021-07-23 15:55:10 +08:00
• 3fb8bfafb9 Merge remote-tracking branch 'origin/develop_master' into develop_1 zzy 2021-07-23 15:16:16 +08:00
• 06aa79e3f6 update：增加高级查询 zzy 2021-07-23 15:03:02 +08:00
• 66f9763b96 添加了修改第三方链接排序接口 zhaokaiyao@91isoft.com 2021-07-23 15:00:47 +08:00
• dc884c0162 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-23 06:56:07 +00:00
• 8ec8db0437 update:优化sql zj 2021-07-23 14:51:45 +08:00
• 8d1280d484 标准清单入库 bug修复 yuezhihang 2021-07-23 12:51:27 +08:00
• 03723a1522 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-22 09:26:17 +00:00
• c4e563081a update：回复配置文件 zzy 2021-07-22 17:04:55 +08:00
• 454af6e305 Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-22 08:32:12 +00:00
• 3cafbfbb6f Merge remote-tracking branch 'origin/develop_master' into develop_1 zzy 2021-07-22 16:25:23 +08:00
• 91c4dea4db update:清单导出，增加编辑，修复bug zzy 2021-07-22 16:10:53 +08:00
• 6c7baa65af Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-22 14:53:08 +08:00
• 2ca543d981 添加岗位时,设置操作时间为当前系统时间 zhaokaiyao@91isoft.com 2021-07-22 14:52:11 +08:00
• b3f9244345 修改了国内法规导出excl表单的字段 zhaokaiyao@91isoft.com 2021-07-22 10:58:22 +08:00
• ae16a14ea1 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-22 10:26:14 +08:00
• 2783e02b1e 链接新增bug 修复 yuezhihang 2021-07-22 10:26:09 +08:00
• f840e2e79d Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-21 11:15:31 +00:00
• 7f874329a8 Merge remote-tracking branch 'origin/develop_3' into develop_3 super_liu 2021-07-21 19:14:36 +08:00
• 4dfb0039ad feat: 迁移企业标准库 国内外标准库 懒加载 树结构 super_liu 2021-07-21 19:14:22 +08:00
• 462068b90a 修改未符合项查询bug Wanghong 2021-07-21 18:17:09 +08:00
• eaa9681269 修复未符合项查询bug Wanghong 2021-07-21 18:04:48 +08:00
• 6f3a3f2634 Merge remote-tracking branch 'origin/develop_1' into develop_1 Wanghong 2021-07-21 17:59:20 +08:00
• b20e1480e3 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-21 16:41:42 +08:00
• 3595ea2aa3 标准清单入库 bug修复 yuezhihang 2021-07-21 16:41:37 +08:00
• 1ad63eff70 默认变更列表 Wanghong 2021-07-21 16:02:50 +08:00
• 7618db7a47 ("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏 zhaokaiyao@91isoft.com 2021-07-21 15:18:58 +08:00
• 310cdf9473 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-21 14:07:53 +08:00
• cfd77fadc3 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-21 05:56:30 +00:00
• 706b6ce264 Merge remote-tracking branch 'origin/develop_3' into develop_3 zhaokaiyao@91isoft.com 2021-07-21 11:35:58 +08:00
• 5825d8793f 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员 添加getFirstInstitution()接口,返回机构第一级目录 zhaokaiyao@91isoft.com 2021-07-21 11:30:44 +08:00
• 1ceee2f1bf Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-21 10:52:26 +08:00
• 7d890e7fcd 评估流程 yuezhihang 2021-07-21 10:52:22 +08:00
• 4cee0f6bf5 修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部 添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员 添加getFirstInstitution()接口,返回机构第一级目录 zhaokaiyao@91isoft.com 2021-07-21 10:03:49 +08:00
• 3af52f37f4 update:缩短查询时间 zzy 2021-07-20 16:39:51 +08:00
• 622da17650 Merge remote-tracking branch 'origin/develop_1' into develop_1 Wanghong 2021-07-20 15:29:17 +08:00
• 409fa79bdc add:车型项目库 调取 批量删除 导出 zj 2021-07-20 15:12:45 +08:00
• 8ce15424ac update:修复清单bug zzy 2021-07-20 13:36:55 +08:00
• ce1ba143aa Merge branch 'develop_1' of http://gitlab.91isoft.com:90/LiuChao/foton-slrs-system-rest into develop_1 Wanghong 2021-07-20 11:07:05 +08:00
• 632c4b2f67 Merge remote-tracking branch 'origin/develop_master' into develop_1 zzy 2021-07-20 10:35:00 +08:00
• c695984425 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-19 08:30:43 +00:00
• 7db2b79b63 feat: 首页标准发布 super_liu 2021-07-19 16:29:52 +08:00
• e3e638a8b3 update:sql语句 zzy 2021-07-19 14:22:13 +08:00
• b564ff964a Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-19 14:15:26 +08:00
• 8f6bdf4fe8 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-19 14:14:17 +08:00
• ff3547f05e update:检索条件 zzy 2021-07-19 14:13:41 +08:00
• cada0c2239 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-19 04:04:16 +00:00
• 21931a9455 feat: 标准库 super_liu 2021-07-19 12:02:56 +08:00
• a2be968da5 提交分解单列表，增加筛选条件-根据国内外标准筛选 修改一个bug，拆分解单提交功能，报错后不让入库操作 duanwenbin 2021-07-19 09:32:23 +08:00
• e80e585f9e Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-18 09:11:29 +00:00
• 63181803aa feat: 标准库 super_liu 2021-07-18 17:10:35 +08:00
• eca5c9ae33 Update application-dev.properties 王夏晖 2021-07-16 08:50:12 +00:00
• ee73581912 Update application.properties 王夏晖 2021-07-16 08:27:45 +00:00
• 299e69b383 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-16 16:05:50 +08:00
• be34548613 update:封装标准信息 zzy 2021-07-16 16:05:20 +08:00
• 22e5bb519c Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-16 14:41:45 +08:00
• 2b3bcae6f2 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-16 14:39:25 +08:00
• 06c616a682 add：新增标准查询 zzy 2021-07-16 14:08:16 +08:00
• 59b8ee7e19 Update application-dev.properties zxy-lbj 2021-07-16 03:10:09 +00:00
• d60dfc5671 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-15 10:38:32 +00:00