FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
310 Commits 1 Branch 0 Tags
f5ceeebbf681ae8e777055b08770b624d59e10e7
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
super_liu 25528d92a8 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !50
 2021-07-23 08:03:18 +00:00
super_liu f840e2e79d Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !40
 2021-07-21 11:15:31 +00:00
super_liu 7f874329a8 Merge remote-tracking branch 'origin/develop_3' into develop_3 2021-07-21 19:14:36 +08:00
super_liu 4dfb0039ad feat: 迁移企业标准库 国内外标准库 懒加载 树结构 2021-07-21 19:14:22 +08:00
super_liu cfd77fadc3 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !38
 2021-07-21 05:56:30 +00:00
super_liu c695984425 Merge branch 'develop_3' into 'develop_master' 
feat: 首页标准发布

See merge request !37
 2021-07-19 08:30:43 +00:00
super_liu 7db2b79b63 feat: 首页标准发布 2021-07-19 16:29:52 +08:00
super_liu cada0c2239 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !36
 2021-07-19 04:04:16 +00:00
super_liu 21931a9455 feat: 标准库 2021-07-19 12:02:56 +08:00
super_liu e80e585f9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !35
 2021-07-18 09:11:29 +00:00
super_liu 63181803aa feat: 标准库 2021-07-18 17:10:35 +08:00
super_liu d60dfc5671 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request !34
 2021-07-15 10:38:32 +00:00
super_liu 5efce6f2d1 feat: vpps model 添加树结构 2021-07-15 18:37:49 +08:00
super_liu 23e90a822c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-07-15 17:16:11 +08:00
super_liu 90e701154d Merge branch 'develop_3' into 'develop_master' 
feat: 标准入库流程 带入 逻辑

See merge request !33
 2021-07-15 09:15:45 +00:00
super_liu de97f459fd feat: 标准入库流程 带入 逻辑 2021-07-15 17:14:54 +08:00
super_liu 8aa0d66d0e Merge branch 'develop_3' into 'develop_master' 
feat: 添加企业标准库 接口服务

See merge request !24
 2021-07-13 06:27:51 +00:00
super_liu 9930cbae9b feat: 添加企业标准库 接口服务 2021-07-13 14:25:06 +08:00
super_liu cdf0ecd04e Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 详情 文件类 修改

See merge request !23
 2021-07-12 10:10:37 +00:00
super_liu 51ed1c269d feat: 标准库 详情 文件类 修改 2021-07-12 18:09:24 +08:00
super_liu a160d81c9e Merge branch 'develop_3' into 'develop_master' 
feat: 标准文本信息上传

See merge request !22
 2021-07-12 03:03:37 +00:00
super_liu f41d94bbd9 feat: 标准文本信息上传 2021-07-12 11:02:11 +08:00
super_liu b335387242 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库

See merge request !21
 2021-07-11 07:49:10 +00:00
super_liu 43434a68e0 feat: 标准库 2021-07-11 15:47:02 +08:00
super_liu 4cf827998b Merge branch 'develop_3' into 'develop_master' 
feat: 入库流程 属性字段对应

See merge request !20
 2021-07-10 07:52:58 +00:00
super_liu 48933b44dc feat: 入库流程 属性字段对应 2021-07-10 15:43:35 +08:00
super_liu a535f138d9 Merge branch 'develop_3' into 'develop_master' 
feat: 标准库 体系树形结构等

See merge request !19
 2021-07-09 10:17:43 +00:00
super_liu c06cb07db6 feat: 标准库 体系树形结构等 2021-07-09 18:16:10 +08:00
super_liu 78d87640eb Merge branch 'develop_3' into 'develop_master' 
Develop 3  feat: 标准库 左侧树 相关 配置标准 更新记录相关等

See merge request !18
 2021-07-08 14:59:10 +00: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 4f7d1648db Merge branch 'develop_3' into 'develop_master' 
feat: 数据字典 树形结构

See merge request !17
 2021-07-08 06:20:39 +00:00
super_liu 521c81c8bb Merge branch 'develop_1' into 'develop_master' 
update:优化查询速度

See merge request !16
 2021-07-08 06:19:52 +00:00
super_liu f59419de62 feat: 数据字典 树形结构 2021-07-08 14:00:51 +08:00
super_liu 51bd89fc13 Merge branch 'develop_3' into 'develop_master' 
hh Develop 3

See merge request !15
 2021-07-06 08:12:45 +00: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
super_liu 006fb9a1f4 feat: 标准入库流程 2021-06-23 18:11:55 +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
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
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
super_liu 7659decee1 Merge branch 'develop_2' into 'develop_master' 
Develop 2

See merge request !8
 2021-06-18 07:46:25 +00: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
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
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
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
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
super_liu 827d59bb7b Merge branch 'develop_3' into 'develop_master' 
feat: 数据字典 查询问题

See merge request !2
 2021-06-16 03:00:24 +00:00
super_liu cc7ee9bd83 feat: 解决问题提交 2021-06-15 21:14:08 +08:00
super_liu d71c756f1a Merge remote-tracking branch 'origin/develop' into develop 2021-06-15 20:52:48 +08:00
super_liu 9d704f4d1e feat: 迁移标准属性自定义 修改相关问题 2021-06-15 18:45:21 +08:00
super_liu e737cc225d feat:1 2021-06-10 14:14:16 +08:00
super_liu f953beef47 feat:统一上汽接口路径 2021-06-10 13:44:08 +08:00
super_liu 93c93a6999 feat:1 2021-06-10 13:41:41 +08:00
super_liu 1c4170f3ee feat:添加工作组前缀 2021-06-10 13:40:08 +08:00
super_liu 702a9f37fc feat: 工作组提交接口 2021-06-10 13:39:03 +08:00
super_liu fe5ac94671 feat: 组菜单接口 2021-06-10 13:33:57 +08:00
super_liu 84b9bcd927 feat:添加前缀 2021-06-10 11:07:41 +08:00
super_liu 9d02bfc2d8 feat:菜单目录添加接口 2021-06-10 11:05:16 +08:00
super_liu 19c7a56d73 feat: 标准入库流程测试实例提交 及 项目token固定用户admin 2021-06-09 17:34:42 +08:00
super_liu fe786eec40 feat:清单详情接口添加前缀 2021-06-09 13:51:04 +08:00
super_liu 9d19ef728a feat: 清单详情添加接口 2021-06-09 13:48:48 +08:00
super_liu 6bdfb8afa4 feat: 法规详情 2021-06-09 10:41:39 +08:00
super_liu 712ec4a336 feat:提交标准详情接口 2021-06-09 10:14:43 +08:00
super_liu 2b5164ddd3 feat: 添加子模块-工作流 集成相关配置 2021-06-08 22:23:40 +08:00
super_liu 01564275db feat: 全部意见添加提意 2021-06-07 16:11:56 +08:00
super_liu dd8a90aabd feat: 全部意见添加提意见人员和部门 2021-06-07 11:33:57 +08:00
super_liu 6d3bc5812b feat: 意见分页查询 2021-06-07 11:00:07 +08:00
super_liu cf58eca004 feat: 意见分页查询 2021-06-07 10:45:22 +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
super_liu a18735496e feat: 修改 意见列表 条件查询 2021-06-04 15:48:50 +08:00
super_liu 1a7289f016 feat: 1 2021-06-04 13:59:07 +08:00
super_liu 034410d515 feat: 添加api前缀 2021-06-04 13:47:40 +08:00
super_liu e575d3b9bd feat: 过滤jwt验证 2021-06-04 13:41:49 +08:00
super_liu 6bd02d963b feat: 注释掉登录验证 2021-06-04 00:02:26 +08:00
super_liu b50da1e1fa Merge remote-tracking branch 'origin/develop' into develop 2021-06-03 14:16:18 +08:00
super_liu 3666dda9de feat: 迁移国内标准法规部分4 国内标准法规-删除功能 2021-06-03 14:16:02 +08:00
super_liu aded9a3e47 feat: 迁移国内标准法规部分3 修改国内标准法规 2021-06-03 13:59:17 +08:00
super_liu 4caa481d31 feat: 迁移国内标准法规部分2 创建国内标准法规 2021-06-03 13:39:40 +08:00
super_liu 4cc558befc feat: 迁移国内标准法规部分1 2021-06-02 21:39:20 +08:00
super_liu ac33a531ec feat: 线上测试库更新 2021-06-02 16:11:10 +08:00
super_liu 366e442894 feat: 线上测试库 2021-06-02 13:47:55 +08:00
super_liu a4c923ac5e feat: 修复启动问题 2021-05-31 17:52:52 +08:00
super_liu 230889c3ff feat: 添加slrs业务子项目 修改问题文件 2021-05-31 17:18:43 +08:00
super_liu dd50eaebf4 Update README.md 2021-05-31 06:55:54 +00:00
super_liu 3ed9ca235a feat: 提交项目代码 2021-05-31 14:56:05 +08:00
super_liu d50bb875cb add README 2021-05-31 14:38:58 +08:00