Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• 5efce6f2d1 feat: vpps model 添加树结构 super_liu 2021-07-15 18:37:49 +08:00
• 12fa95cea9 update：修改字段名称，增加导出 zzy 2021-07-15 17:43:19 +08:00
• f398d6a245 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-15 17:37:30 +08:00
• 6f7fb3d25c Merge remote-tracking branch 'origin/develop_master' into develop_master yinglong zhang 2021-07-15 17:16:32 +08:00
• 7751c75ccf feat yinglong zhang 2021-07-15 17:16:21 +08:00
• 23e90a822c Merge remote-tracking branch 'origin/develop_master' into develop_3 super_liu 2021-07-15 17:16:11 +08:00
• 90e701154d Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-15 09:15:45 +00:00
• de97f459fd feat: 标准入库流程 带入 逻辑 super_liu 2021-07-15 17:14:54 +08:00
• 369e1532bc update：增加意见详情查询字段 add：分解单查询时间 zzy 2021-07-15 16:41:37 +08:00
• f96bbb6082 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-15 16:23:34 +08:00
• f52e33fa3c Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-07-15 06:24:04 +00:00
• bf8281f20c Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_1 Wanghong 2021-07-15 09:31:31 +08:00
• 4fc891a623 Merge branch 'develop_3' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_1 Wanghong 2021-07-15 09:31:17 +08:00
• 78b99accc9 提交树形结构代码 duanwenbin 2021-07-14 16:17:50 +08:00
• 2e0f6e7934 update：修改意见导出 zzy 2021-07-14 13:51:40 +08:00
• 8aed75a8f0 Merge remote-tracking branch 'origin/develop_master' into develop_master yinglong zhang 2021-07-13 15:36:33 +08:00
• 35d86a7222 feat 未合规项整改 yinglong zhang 2021-07-13 15:36:17 +08:00
• 8aa0d66d0e Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-13 06:27:51 +00:00
• 9930cbae9b feat: 添加企业标准库 接口服务 super_liu 2021-07-13 14:25:06 +08:00
• d944ad54d7 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-13 10:34:16 +08:00
• cdf0ecd04e Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-12 10:10:37 +00:00
• 718e261ff6 提交本地工具-标准拆分缺失的编辑接口 duanwenbin 2021-07-12 18:10:11 +08:00
• 51ed1c269d feat: 标准库 详情 文件类 修改 super_liu 2021-07-12 18:09:24 +08:00
• 55a47c6973 add:增加ProjectManager zj 2021-07-12 17:30:40 +08:00
• a160d81c9e Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-12 03:03:37 +00:00
• f41d94bbd9 feat: 标准文本信息上传 super_liu 2021-07-12 11:02:11 +08:00
• b335387242 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-11 07:49:10 +00:00
• 43434a68e0 feat: 标准库 super_liu 2021-07-11 15:47:02 +08:00
• 4cf827998b Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-10 07:52:58 +00:00
• 48933b44dc feat: 入库流程 属性字段对应 super_liu 2021-07-10 15:43:35 +08:00
• a535f138d9 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-09 10:17:43 +00:00
• c06cb07db6 feat: 标准库 体系树形结构等 super_liu 2021-07-09 18:16:10 +08:00
• 00798eb2b1 产品线 数据 yuezhihang 2021-07-09 15:28:15 +08:00
• aed855e336 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-09 14:33:21 +08:00
• 952c3ab02a Update application-dev.properties 王夏晖 2021-07-09 03:42:02 +00:00
• 2ee918e1d0 add:关联ts_user表查询+分页 zj 2021-07-09 11:38:19 +08:00
• 3b0fbb34d1 feat 改回注册中心配置 yinglong zhang 2021-07-09 11:05:46 +08:00
• ffe3b2b8c3 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-07-09 09:50:15 +08:00
• 5bbf8556f6 fetch:数据处理 root 2021-07-09 09:49:38 +08:00
• 78d87640eb Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-08 14:59:10 +00:00
• 0842280775 feat: 标准库详情 更新记录 super_liu 2021-07-08 22:56:50 +08:00
• e067c8ae61 feat: 标准库 左侧树 相关 配置标准 相关等 super_liu 2021-07-08 22:34:07 +08:00
• 4b8aac9bc4 标准 发布搞 yuezhihang 2021-07-08 21:04:18 +08:00
• 0a5b8d8580 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-08 20:17:00 +08:00
• 04792ee931 add:分解单查询 zzy 2021-07-08 20:05:12 +08:00
• e998809767 add:分解单查询 zzy 2021-07-08 20:04:47 +08:00
• dfc10e4b0f Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-08 19:38:54 +08:00
• 7fda1c196c fetch:我的板块改为二级菜单 root 2021-07-08 18:53:33 +08:00
• 142ff05355 fetch:我的板块bug root 2021-07-08 16:58:00 +08:00
• e73e07d681 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-07-08 15:55:00 +08:00
• 4bfbd48dc6 提交本地工具-标准比对的相关接口 duanwenbin 2021-07-08 15:50:05 +08:00
• 9020a2782f Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-07-08 15:46:53 +08:00
• 9432d1a2f4 fetch:我的模块数据 root 2021-07-08 15:46:19 +08:00
• 4f7d1648db Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-08 06:20:39 +00:00
• 521c81c8bb Merge branch 'develop_1' into 'develop_master' super_liu 2021-07-08 06:19:52 +00:00
• bee6ef8a8a Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-08 14:15:16 +08:00
• 035b294423 Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-08 14:14:51 +08:00
• c611fc2234 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-08 14:07:30 +08:00
• 8aade0862c add:产品线项目经理 zj 2021-07-08 14:06:07 +08:00
• f59419de62 feat: 数据字典 树形结构 super_liu 2021-07-08 14:00:51 +08:00
• 2e8a2bba51 提交本地工具-标准拆分相关接口 duanwenbin 2021-07-08 11:21:18 +08:00
• 1ed0888256 提交ocr模块配置 duanwenbin 2021-07-08 09:22:56 +08:00
• 0c8df99fd2 update:优化查询速度 zzy 2021-07-08 09:17:52 +08:00
• c1a0b31372 Merge remote-tracking branch 'origin/develop_master' into develop_master duanwenbin 2021-07-07 11:23:08 +08:00
• 9709acf0a9 提交本地工具模块相关代码 duanwenbin 2021-07-07 11:21:42 +08:00
• fb05c70666 test root 2021-07-07 10:52:45 +08:00
• 3c7acb2705 Update application-dev.properties 王夏晖 2021-07-07 02:21:45 +00:00
• b39fda6c43 feat 改回注册中心配置 yinglong zhang 2021-07-07 09:55:52 +08:00
• f91b481180 Merge remote-tracking branch 'origin/develop_master' into develop_master yinglong zhang 2021-07-07 09:54:08 +08:00
• 9a00280ba0 feat 改回注册中心配置 yinglong zhang 2021-07-07 09:53:29 +08:00
• 9f856079ee 标准清单入库 bug修复 yuezhihang 2021-07-06 20:14:34 +08:00
• b4c0465f18 Merge remote-tracking branch 'origin/develop_1' into develop_master yuezhihang 2021-07-06 19:12:25 +08:00
• 106e808b99 update:清单修改，清单新增 zzy 2021-07-06 18:08:08 +08:00
• 1ea0d09cb0 fetch:机构人员bug root 2021-07-06 17:30:30 +08:00
• 51bd89fc13 Merge branch 'develop_3' into 'develop_master' super_liu 2021-07-06 08:12:45 +00:00
• bd73773b19 feat: 国内外标准 树形结构查询标准库 super_liu 2021-07-06 16:05:27 +08:00
• 643ce6b932 标准清单入库流程 yuezhihang 2021-07-05 15:45:24 +08:00
• 2004286bca Merge remote-tracking branch 'origin/develop_master' into develop_master yuezhihang 2021-07-05 15:43:45 +08:00
• 2f462ccdb7 标准清单入库流程 yuezhihang 2021-07-05 15:42:42 +08:00
• 367b0f5f7c Merge remote-tracking branch 'origin/develop_master' into develop_master yinglong zhang 2021-07-05 15:02:05 +08:00
• 773b75a3fe feat 合并分支 yinglong zhang 2021-07-05 15:01:40 +08:00
• 5bc2050104 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-07-05 14:58:16 +08:00
• c84a8a63ee fetch:机构接口修改 root 2021-07-05 14:57:15 +08:00
• 75a7a90e9d Merge branch 'develop_master' into develop_3 super_liu 2021-07-05 11:10:43 +08:00
• 7bb46ef07f Update application-dev.properties 王夏晖 2021-07-05 02:34:45 +00:00
• 011b5e247a 同步代码 root 2021-07-05 10:32:41 +08:00
• 9e97c80c5e Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-07-04 16:48:26 +08:00
• 1f9f5ac2fa 查询机构人员 root 2021-07-04 16:45:52 +08:00
• 531bb9e7ce feat 合并分支 yinglong zhang 2021-07-04 16:41:37 +08:00
• a6442d5b8d Merge remote-tracking branch 'origin/develop_master' into develop_master 2510220824 2021-07-04 13:58:21 +08:00
• 3e69a462b0 add:IDM组织、人员数据同步 2510220824 2021-07-04 13:57:56 +08:00
• afee88a408 fetch:资源修改 root 2021-07-02 17:32:26 +08:00
• 8e5b8bb239 Update application.properties zxy-lbj 2021-07-02 03:29:41 +00:00
• 64e95dc4a6 Update application-dev.properties zxy-lbj 2021-07-02 03:28:49 +00:00
• eb5f2a9e87 Update RestTemplateConfig.java zxy-lbj 2021-07-02 03:14:22 +00:00
• 062d948719 Update RestTemplateConfig.java zxy-lbj 2021-07-02 03:06:30 +00:00
• 6c56c8ba29 Update RestTemplateConfig.java zxy-lbj 2021-07-02 03:04:04 +00:00
• 4a8b94408d fetch:加入负载均衡 root 2021-07-02 11:02:29 +08:00
• e487fc3a79 Update application-dev.properties zxy-lbj 2021-07-02 02:38:07 +00:00
• 0ed5e3d595 Update application-dev.properties zxy-lbj 2021-07-02 02:36:14 +00:00