FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
134 Commits 1 Branch 0 Tags
52015144b57795f9bc1b0eaf348c9db0f2b439dd
Commit Graph
134 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
root 52015144b5 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 
 Conflicts:
	adc-da-main/src/main/resources/application-dev.properties
 2021-06-30 13:37:56 +08:00
王夏晖 b69bc81066 Update application-dev.properties 2021-06-30 05:02:07 +00:00
root c4a885922d 获取当前登录的用户权限 2021-06-29 17:28:16 +08:00
yinglong zhang 33254d9248 Merge remote-tracking branch 'origin/develop_master' into develop_2 2021-06-29 16:34:44 +08:00
root 39e5e4c4c5 人员配置机构 2021-06-29 16:34:02 +08:00
王夏晖 95f8f7dfff Merge branch 'develop_1' into 'develop_master' 
add:标准法规清单

See merge request !14
 2021-06-29 06:57:10 +00:00
yinglong zhang 4533960ef9 feat 修改了一些搜索模块 2021-06-29 09:07:06 +08:00
赵肖云 26a5022c03 fetch:新增查询角色详情接口 2021-06-28 13:56:19 +08:00
zzy 346866e0ba add:标准法规清单 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
yinglong zhang 89a7a5ee7f feat 合并分支 2021-06-24 17:50:12 +08:00
yinglong zhang 31ee78f374 feat 合并分支 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
yinglong zhang a069424edf feat 重写了一些诡异的代码 2021-06-24 11:05:25 +08:00
赵肖云 b0751be63a 岗位管理 2021-06-24 10:43:53 +08:00
yinglong zhang 7aeb6b099a feat 重写了一些诡异的代码 2021-06-24 10:23:52 +08:00
yinglong zhang f284c60088 feat 重写了一些诡异的代码 2021-06-24 09:58:06 +08:00
super_liu d957107510 Merge branch 'develop_3' into 'develop_master' 
feat: 登陆修改

See merge request !13
 2021-06-23 07:26:03 +00:00
super_liu fa985d2d58 feat: 登陆修改 2021-06-23 15:25:41 +08:00
yinglong zhang a01ca3fd49 feat 重写了一些诡异的代码 2021-06-23 10:43:31 +08:00
赵肖云 a1503fd90f fetch:UUID修改 2021-06-23 09:22:55 +08:00
super_liu bd01b11ea8 Merge branch 'develop_master' into develop_3 
# Conflicts:
#	adc-da-slrs/src/main/resources/mybatis/mapper/SarCompResAssess/SarCompResAssessMapper.xml
 2021-06-22 18:15:00 +08:00
super_liu e985820f27 Merge branch 'develop_3' into 'develop_master' 
Develop 3 提交

See merge request !12
 2021-06-22 10:12:39 +00:00
super_liu 541c4d0bda Merge branch 'develop_1' into 'develop_master' 
update:修改路径

See merge request !11
 2021-06-22 10:07:29 +00:00
super_liu 12d9bd7b51 feat: 标准入库 2021-06-22 18:07:08 +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
zj 069d66f681 update:修改路径 2021-06-22 14:44:59 +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
super_liu c3f912eefb feat: 流程入库 及 杂七杂八 2021-06-21 18:36:52 +08: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