FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
781 Commits 1 Branch 0 Tags
7ad71e5e6a9ec29ba330d07a5d79d96fcc66252d
Commit Graph
203 Commits
Author SHA1 Message Date
super_liu 4f7d1648db Merge branch 'develop_3' into 'develop_master' 
feat: 数据字典 树形结构

See merge request !17
 2021-07-08 06:20:39 +00:00
super_liu f59419de62 feat: 数据字典 树形结构 2021-07-08 14:00:51 +08:00
duanwenbin 2e8a2bba51 提交本地工具-标准拆分相关接口 2021-07-08 11:21:18 +08:00
duanwenbin c1a0b31372 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-sys/src/main/resources/mybatis/mapper/att/AttFileEOMapper.xml
 2021-07-07 11:23:08 +08:00
duanwenbin 9709acf0a9 提交本地工具模块相关代码 2021-07-07 11:21:42 +08:00
yuezhihang 9f856079ee 标准清单入库 bug修复 2021-07-06 20:14:34 +08:00
root 1ea0d09cb0 fetch:机构人员bug 2021-07-06 17:30:30 +08:00
root c84a8a63ee fetch:机构接口修改 2021-07-05 14:57:15 +08:00
root 011b5e247a 同步代码 2021-07-05 10:32:41 +08:00
root 1f9f5ac2fa 查询机构人员 2021-07-04 16:45:52 +08:00
root 086c387165 查询机构人员 2021-07-01 18:17:04 +08:00
root 349737cd67 fetch:权限 2021-07-01 10:50:56 +08:00
root b543a9502d 资源管理 2021-06-30 17:28:39 +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
zzy 346866e0ba add:标准法规清单 2021-06-27 16:02:59 +08:00
yinglong zhang 31ee78f374 feat 合并分支 2021-06-24 17:39:01 +08:00
赵肖云 11a5e50621 fetch:删除角色 2021-06-24 11:22:21 +08:00
赵肖云 b0751be63a 岗位管理 2021-06-24 10:43:53 +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 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
赵肖云 7fa56b9905 fetch:通过name查询角色 2021-06-22 17:17:07 +08:00
yinglong zhang 907a54c3a9 fetch:添加个人 2021-06-22 17:15:06 +08:00
赵肖云 322e057cd4 fetch:新增机构/人员 2021-06-22 14:06:01 +08:00
yinglong zhang a506f93622 add 添加个人模块 2021-06-22 09:50:44 +08: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
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 63ae81ae99 Merge branch 'develop_master' into develop_2 2021-06-17 17:29:33 +08:00
root 2bb3aab2e0 未符合项/重点问题管理 2021-06-17 11:20:10 +08: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
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
super_liu 6f416e24e6 feat: 区域管理 2021-06-16 15:07:34 +08:00
super_liu d71c756f1a Merge remote-tracking branch 'origin/develop' into develop 2021-06-15 20:52:48 +08:00
zj a703e26ba4 标准预警 优化名称 2021-06-15 18:49:54 +08:00
super_liu 9d704f4d1e feat: 迁移标准属性自定义 修改相关问题 2021-06-15 18:45:21 +08:00
root 1fdfc7a7fb 未符合项代码生成 2021-06-15 16:41:26 +08:00
super_liu e737cc225d feat:1 2021-06-10 14:14:16 +08:00
super_liu fe5ac94671 feat: 组菜单接口 2021-06-10 13:33:57 +08:00
super_liu 9d19ef728a feat: 清单详情添加接口 2021-06-09 13:48:48 +08:00
zzy 9ce1094070 add:标准公开征求意见 2021-06-05 15:34:43 +08:00
super_liu b8dc259f15 feat: 迁移国内标准法规部分6 详情 下载 标准查询 2021-06-05 01:07:57 +08:00
super_liu 7ae47063b4 feat: 迁移国内标准法规部分5 标准号验证 导入 导出 2021-06-04 22:53:52 +08:00
super_liu 8457c5ce97 feat: 根据部门和层级获取人员 及 区域 及 全部意见CID条件查询 2021-06-04 17:28:51 +08:00