Commit Graph

Select branches

Hide Pull Requests

dev_20231201_feizhi

Mono Color

• b5fae61dc2 Update application-dev.properties zxy-lbj 2021-07-02 02:28:34 +00:00
• 8db629a3f8 Update application-dev.properties zxy-lbj 2021-07-02 02:27:45 +00:00
• 086c387165 查询机构人员 root 2021-07-01 18:17:04 +08:00
• 462062e6b5 fetch:循环依赖 root 2021-07-01 14:20:18 +08:00
• d8cbcad8c9 fetch:循环依赖 root 2021-07-01 14:19:41 +08:00
• af2bf00713 fetch:解决循环依赖 root 2021-07-01 14:05:27 +08:00
• 03162b8e85 Update application-dev.properties zxy-lbj 2021-07-01 03:31:06 +00:00
• 349737cd67 fetch:权限 root 2021-07-01 10:50:56 +08:00
• b543a9502d 资源管理 root 2021-06-30 17:28:39 +08:00
• bad0f16f90 fetch:取消serach模块 root 2021-06-30 14:01:31 +08:00
• 52015144b5 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 root 2021-06-30 13:37:56 +08:00
• b69bc81066 Update application-dev.properties 王夏晖 2021-06-30 05:02:07 +00:00
• c4a885922d 获取当前登录的用户权限 root 2021-06-29 17:28:16 +08:00
• 33254d9248 Merge remote-tracking branch 'origin/develop_master' into develop_2 yinglong zhang 2021-06-29 16:34:44 +08:00
• 39e5e4c4c5 人员配置机构 root 2021-06-29 16:34:02 +08:00
• 95f8f7dfff Merge branch 'develop_1' into 'develop_master' 王夏晖 2021-06-29 06:57:10 +00:00
• 4533960ef9 feat 修改了一些搜索模块 yinglong zhang 2021-06-29 09:07:06 +08:00
• 26a5022c03 fetch:新增查询角色详情接口 赵肖云 2021-06-28 13:56:19 +08:00
• 346866e0ba add:标准法规清单 zzy 2021-06-27 16:02:59 +08:00
• 8378ec131c Merge branch 'develop_2' of http://103.249.252.28:90/LiuChao/foton-slrs-system-rest into develop_2 赵肖云 2021-06-25 15:49:42 +08:00
• 209f43fe1a fetch:人员添加字段 赵肖云 2021-06-25 15:49:30 +08:00
• 89a7a5ee7f feat 合并分支 yinglong zhang 2021-06-24 17:50:12 +08:00
• 31ee78f374 feat 合并分支 yinglong zhang 2021-06-24 17:39:01 +08:00
• 1398f34c1e 角色添加权限 赵肖云 2021-06-24 14:08:51 +08:00
• 2854d385f1 Merge remote-tracking branch 'origin/develop_2' into develop_2 赵肖云 2021-06-24 11:22:39 +08:00
• 11a5e50621 fetch:删除角色 赵肖云 2021-06-24 11:22:21 +08:00
• a069424edf feat 重写了一些诡异的代码 yinglong zhang 2021-06-24 11:05:25 +08:00
• b0751be63a 岗位管理 赵肖云 2021-06-24 10:43:53 +08:00
• 7aeb6b099a feat 重写了一些诡异的代码 yinglong zhang 2021-06-24 10:23:52 +08:00
• f284c60088 feat 重写了一些诡异的代码 yinglong zhang 2021-06-24 09:58:06 +08:00
• 006fb9a1f4 feat: 标准入库流程 super_liu 2021-06-23 18:11:55 +08:00
• d957107510 Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-23 07:26:03 +00:00
• fa985d2d58 feat: 登陆修改 super_liu 2021-06-23 15:25:41 +08:00
• a01ca3fd49 feat 重写了一些诡异的代码 yinglong zhang 2021-06-23 10:43:31 +08:00
• a1503fd90f fetch:UUID修改 赵肖云 2021-06-23 09:22:55 +08:00
• e985820f27 Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-22 10:12:39 +00:00
• bd01b11ea8 Merge branch 'develop_master' into develop_3 super_liu 2021-06-22 18:15:00 +08:00
• 541c4d0bda Merge branch 'develop_1' into 'develop_master' super_liu 2021-06-22 10:07:29 +00:00
• 12d9bd7b51 feat: 标准入库 super_liu 2021-06-22 18:07:08 +08:00
• bb5657ca40 feat 解决冲突 yinglong zhang 2021-06-22 17:34:38 +08:00
• 162b3f3779 Merge branch 'develop_2' into develop_sync_1 yinglong zhang 2021-06-22 17:26:29 +08:00
• 5959dd28c7 Merge remote-tracking branch 'origin/develop_2' into develop_2 yinglong zhang 2021-06-22 17:23:58 +08:00
• 08525ab186 Merge remote-tracking branch 'origin/develop_sync_1' into develop_2 yinglong zhang 2021-06-22 17:22:00 +08:00
• 7fa56b9905 fetch:通过name查询角色 赵肖云 2021-06-22 17:17:07 +08:00
• 907a54c3a9 fetch:添加个人 yinglong zhang 2021-06-22 17:15:06 +08:00
• 51d3edebfd add:集成es搜索模块 2510220824 2021-06-22 17:14:39 +08:00
• faa9d4e48a add 添加个人模块 yinglong zhang 2021-06-22 17:02:12 +08:00
• 5710f0fb36 add 添加个人模块 yinglong zhang 2021-06-22 16:49:07 +08:00
• 069d66f681 update:修改路径 zj 2021-06-22 14:44:59 +08:00
• 322e057cd4 fetch:新增机构/人员 赵肖云 2021-06-22 14:06:01 +08:00
• 07c2fae280 add 添加个人模块 yinglong zhang 2021-06-22 09:54:31 +08:00
• a506f93622 add 添加个人模块 yinglong zhang 2021-06-22 09:50:44 +08:00
• 90b6714345 Merge branch 'develop_1' into 'develop_master' super_liu 2021-06-22 01:11:39 +00:00
• c3f912eefb feat: 流程入库 及 杂七杂八 super_liu 2021-06-21 18:36:52 +08:00
• 487885d859 feat 修改标准合规评估结果接口 yinglong zhang 2021-06-21 17:49:39 +08:00
• 53921b2123 Merge remote-tracking branch 'origin/develop_1' into develop_1 super_l_test 2021-06-21 10:58:08 +08:00
• 3489367a24 feat:文件上传 super_l_test 2021-06-21 10:57:02 +08:00
• ab86438733 add:车型/项目库 zj 2021-06-21 10:52:04 +08:00
• d5db8f8cca add:车型/项目库 zj 2021-06-21 10:51:54 +08:00
• 41dd1bf6b9 add:车型/项目库 zj 2021-06-21 10:44:36 +08:00
• ce74d69ed3 add:点击项目名称查询 zj 2021-06-21 10:26:25 +08:00
• 64a3f73702 add:点击项目名称查询 zj 2021-06-21 10:25:23 +08:00
• 8a2790d705 fetch:未符合项查询bug 赵肖云 2021-06-21 09:13:43 +08:00
• 7659decee1 Merge branch 'develop_2' into 'develop_master' super_liu 2021-06-18 07:46:25 +00:00
• b85c133749 fetch: 修改关闭未符合项接口数据格式 赵肖云 2021-06-18 15:46:31 +08:00
• ee13575b53 Merge remote-tracking branch 'origin/develop_2' into develop yinglong zhang 2021-06-18 15:35:31 +08:00
• f5e2d04d30 feat 修改标准合规评估结果接口 yinglong zhang 2021-06-18 15:32:47 +08:00
• 3d88678e5f Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-17 09:44:43 +00:00
• 3f79fe9df6 feat:国内标准法规树结构节点查询数据 yf 2021-06-17 17:40:43 +08:00
• 63ae81ae99 Merge branch 'develop_master' into develop_2 super_liu 2021-06-17 17:29:33 +08:00
• 37930e0b07 feat: 标准实体 super_liu 2021-06-17 11:32:28 +08:00
• 2bb3aab2e0 未符合项/重点问题管理 root 2021-06-17 11:20:10 +08:00
• 1e5ac1b1dd Update application.properties 王夏晖 2021-06-17 02:45:31 +00:00
• 282c314da9 Update application-dev.properties 王夏晖 2021-06-17 02:11:11 +00:00
• fe3c2a4f6a Update application-dev.properties 王夏晖 2021-06-17 02:11:00 +00:00
• 8bdf3cb9dc Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-16 10:07:52 +00:00
• 810d7124e5 Merge remote-tracking branch 'origin/develop_3' into develop_3 yf 2021-06-16 18:07:33 +08:00
• 1c7af6e4a8 1111 yf 2021-06-16 18:07:17 +08:00
• 9905a4de48 feat: 111 super_liu 2021-06-16 17:55:35 +08:00
• 0a769145de Merge branch 'develop_2' into 'develop_master' super_liu 2021-06-16 09:07:24 +00:00
• 4ffd46b830 add 添加标准合规评估结果接口 yinglong zhang 2021-06-16 17:03:34 +08:00
• 469014cdc1 Merge remote-tracking branch 'origin/develop' into develop yinglong zhang 2021-06-16 15:31:11 +08:00
• fde20d212e Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-16 07:06:26 +00:00
• 6f416e24e6 feat: 区域管理 super_liu 2021-06-16 15:07:34 +08:00
• c15d1e0b28 标准属性添加返回分页总数 yf 2021-06-16 14:31:28 +08:00
• 724eaac159 f super_l_test 2021-06-16 09:14:42 +08:00
• 7d28313fdc Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-16 05:19:38 +00:00
• a671d60556 feat: 默认用户登录admin super_liu 2021-06-16 13:21:04 +08:00
• 827d59bb7b Merge branch 'develop_3' into 'develop_master' super_liu 2021-06-16 03:00:24 +00:00
• a03db1068a feat:1 super_liu 2021-06-16 11:02:02 +08:00
• b4f1cd999a Merge remote-tracking branch 'origin/develop' into develop super_l_test 2021-06-16 09:15:01 +08:00
• 9e99795815 f super_l_test 2021-06-16 09:14:42 +08:00
• cc7ee9bd83 feat: 解决问题提交 super_liu 2021-06-15 21:14:08 +08:00
• d71c756f1a Merge remote-tracking branch 'origin/develop' into develop super_liu 2021-06-15 20:52:48 +08:00
• eb86294f15 update:恢复main模块 root 2021-06-15 19:53:52 +08:00
• a703e26ba4 标准预警 优化名称 zj 2021-06-15 18:49:54 +08:00
• 9d704f4d1e feat: 迁移标准属性自定义 修改相关问题 super_liu 2021-06-15 18:45:21 +08:00
• 790ad9e525 删除测试类 root 2021-06-15 17:13:39 +08:00
• c0a1708f47 取消main模块git关联 root 2021-06-15 17:05:31 +08:00
• 689a394a5a 修改配置 root 2021-06-15 16:42:29 +08:00