FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
166 Commits 1 Branch 0 Tags
43434a68e073f9e6a078549da17020d44c4d44d0
Commit Graph
114 Commits
Author SHA1 Message Date
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
super_liu 48933b44dc feat: 入库流程 属性字段对应 2021-07-10 15:43:35 +08:00
super_liu c06cb07db6 feat: 标准库 体系树形结构等 2021-07-09 18:16:10 +08:00
super_liu 0842280775 feat: 标准库详情 更新记录 2021-07-08 22:56:50 +08:00
super_liu e067c8ae61 feat: 标准库 左侧树 相关 配置标准 相关等 2021-07-08 22:34:07 +08:00
super_liu f59419de62 feat: 数据字典 树形结构 2021-07-08 14:00:51 +08:00
super_liu bd73773b19 feat: 国内外标准 树形结构查询标准库 2021-07-06 16:05:27 +08:00
super_liu 75a7a90e9d Merge branch 'develop_master' into develop_3 2021-07-05 11:10:43 +08:00
root 011b5e247a 同步代码 2021-07-05 10:32:41 +08:00
root 1f9f5ac2fa 查询机构人员 2021-07-04 16:45:52 +08:00
root afee88a408 fetch:资源修改 2021-07-02 17:32:26 +08:00
root 4a8b94408d fetch:加入负载均衡 2021-07-02 11:02:29 +08:00
root 086c387165 查询机构人员 2021-07-01 18:17:04 +08:00
root 462062e6b5 fetch:循环依赖 2021-07-01 14:20:18 +08:00
root d8cbcad8c9 fetch:循环依赖 2021-07-01 14:19:41 +08:00
root af2bf00713 fetch:解决循环依赖 2021-07-01 14:05:27 +08:00
root 349737cd67 fetch:权限 2021-07-01 10:50:56 +08:00
root b543a9502d 资源管理 2021-06-30 17:28:39 +08:00
root bad0f16f90 fetch:取消serach模块 2021-06-30 14:01:31 +08: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
赵肖云 11a5e50621 fetch:删除角色 2021-06-24 11:22:21 +08:00
赵肖云 b0751be63a 岗位管理 2021-06-24 10:43:53 +08:00
super_liu 006fb9a1f4 feat: 标准入库流程 2021-06-23 18:11:55 +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 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 a506f93622 add 添加个人模块 2021-06-22 09:50:44 +08:00