FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106 Commits 1 Branch 0 Tags
a01ca3fd4947d4b5166751a0b7a03172136a0863
Commit Graph
106 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yinglong zhang a01ca3fd49 feat 重写了一些诡异的代码 2021-06-23 10:43:31 +08:00
赵肖云 a1503fd90f fetch:UUID修改 2021-06-23 09:22:55 +08:00
yinglong zhang bb5657ca40 feat 解决冲突 2021-06-22 17:34:38 +08:00
yinglong zhang 162b3f3779 Merge branch 'develop_2' into develop_sync_1 2021-06-22 17:26:29 +08:00
yinglong zhang 5959dd28c7 Merge remote-tracking branch 'origin/develop_2' into develop_2 2021-06-22 17:23:58 +08:00
yinglong zhang 08525ab186 Merge remote-tracking branch 'origin/develop_sync_1' into develop_2 2021-06-22 17:22:00 +08:00
赵肖云 7fa56b9905 fetch:通过name查询角色 2021-06-22 17:17:07 +08:00
yinglong zhang 907a54c3a9 fetch:添加个人 2021-06-22 17:15:06 +08:00
2510220824 51d3edebfd add:集成es搜索模块 2021-06-22 17:14:39 +08:00
yinglong zhang faa9d4e48a add 添加个人模块 2021-06-22 17:02:12 +08:00
yinglong zhang 5710f0fb36 add 添加个人模块 2021-06-22 16:49:07 +08:00
赵肖云 322e057cd4 fetch:新增机构/人员 2021-06-22 14:06:01 +08:00
yinglong zhang 07c2fae280 add 添加个人模块 2021-06-22 09:54:31 +08:00
yinglong zhang a506f93622 add 添加个人模块 2021-06-22 09:50:44 +08:00
super_liu 90b6714345 Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !10
 2021-06-22 01:11:39 +00:00
yinglong zhang 487885d859 feat 修改标准合规评估结果接口 2021-06-21 17:49:39 +08:00
super_l_test 53921b2123 Merge remote-tracking branch 'origin/develop_1' into develop_1 2021-06-21 10:58:08 +08:00
super_l_test 3489367a24 feat:文件上传 2021-06-21 10:57:02 +08:00
zj ab86438733 add:车型/项目库 2021-06-21 10:52:04 +08:00
zj d5db8f8cca add:车型/项目库 2021-06-21 10:51:54 +08:00
zj 41dd1bf6b9 add:车型/项目库 2021-06-21 10:44:36 +08:00
zj ce74d69ed3 add:点击项目名称查询 2021-06-21 10:26:25 +08:00
zj 64a3f73702 add:点击项目名称查询 2021-06-21 10:25:23 +08:00
赵肖云 8a2790d705 fetch:未符合项查询bug 2021-06-21 09:13:43 +08:00
赵肖云 b85c133749 fetch: 修改关闭未符合项接口数据格式 2021-06-18 15:46:31 +08:00
super_liu 7659decee1 Merge branch 'develop_2' into 'develop_master' 
Develop 2

See merge request !8
 2021-06-18 07:46:25 +00:00
yinglong zhang ee13575b53 Merge remote-tracking branch 'origin/develop_2' into develop 2021-06-18 15:35:31 +08:00
yinglong zhang f5e2d04d30 feat 修改标准合规评估结果接口 2021-06-18 15:32:47 +08:00
super_liu 3d88678e5f Merge branch 'develop_3' into 'develop_master' 
Develop 3

please agree my request

See merge request !7
 2021-06-17 09:44:43 +00:00
yf 3f79fe9df6 feat:国内标准法规树结构节点查询数据 2021-06-17 17:40:43 +08:00
super_liu 63ae81ae99 Merge branch 'develop_master' into develop_2 2021-06-17 17:29:33 +08:00
super_liu 37930e0b07 feat: 标准实体 2021-06-17 11:32:28 +08:00
root 2bb3aab2e0 未符合项/重点问题管理 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
super_liu 8bdf3cb9dc Merge branch 'develop_3' into 'develop_master' 
Develop 3 feat: 提交  更新 自定义实体

See merge request !6
 2021-06-16 10:07:52 +00:00
yf 810d7124e5 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-06-16 18:07:33 +08:00
yf 1c7af6e4a8 1111 2021-06-16 18:07:17 +08:00
super_liu 9905a4de48 feat: 111 2021-06-16 17:55:35 +08:00
super_liu 0a769145de Merge branch 'develop_2' into 'develop_master' 
Develop 2

add 添加标准合规评估结果接口

See merge request !5
 2021-06-16 09:07:24 +00:00
yinglong zhang 4ffd46b830 add 添加标准合规评估结果接口 2021-06-16 17:03:34 +08:00
yinglong zhang 469014cdc1 Merge remote-tracking branch 'origin/develop' into develop 2021-06-16 15:31:11 +08:00
super_liu 6f416e24e6 feat: 区域管理 2021-06-16 15:07:34 +08:00
super_liu fde20d212e Merge branch 'develop_3' into 'develop_master' 
Develop 3 feat: 自定义分页总数 和 区域管理接口

See merge request !4
 2021-06-16 07:06:26 +00:00
yf c15d1e0b28 标准属性添加返回分页总数 2021-06-16 14:31:28 +08:00
super_l_test 724eaac159 f 2021-06-16 14:03:26 +08:00
super_liu a671d60556 feat: 默认用户登录admin 2021-06-16 13:21:04 +08:00
super_liu 7d28313fdc Merge branch 'develop_3' into 'develop_master' 
feat: 默认用户登录admin

See merge request !3
 2021-06-16 05:19:38 +00:00
super_liu a03db1068a feat:1 2021-06-16 11:02:02 +08:00