FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,802 Commits 1 Branch 0 Tags
06c14bd8cd54af524f44094de2a83e25fd7839f5
Commit Graph
1802 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 299e69b383 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 16:05:50 +08:00
zzy be34548613 update:封装标准信息 2021-07-16 16:05:20 +08:00
yuezhihang 22e5bb519c Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-16 14:41:45 +08:00
yuezhihang 2b3bcae6f2 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-16 14:39:25 +08:00
zzy 06c616a682 add：新增标准查询 2021-07-16 14:08:16 +08:00
zxy-lbj 59b8ee7e19 Update application-dev.properties 2021-07-16 03:10:09 +00: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
zzy 12fa95cea9 update：修改字段名称，增加导出 2021-07-15 17:43:19 +08:00
yuezhihang f398d6a245 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 17:37:30 +08:00
yinglong zhang 6f7fb3d25c Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 17:16:32 +08:00
yinglong zhang 7751c75ccf feat 2021-07-15 17:16:21 +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
zzy 369e1532bc update：增加意见详情查询字段 
add：分解单查询时间
 2021-07-15 16:41:37 +08:00
yuezhihang f96bbb6082 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-15 16:23:34 +08:00
王夏晖 f52e33fa3c Merge branch 'develop_1' into 'develop_master' 
Develop 1

See merge request !32
 2021-07-15 06:24:04 +00:00
Wanghong bf8281f20c Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_1 2021-07-15 09:31:31 +08:00
Wanghong 4fc891a623 Merge branch 'develop_3' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_1 2021-07-15 09:31:17 +08:00
duanwenbin 78b99accc9 提交树形结构代码 2021-07-14 16:17:50 +08:00
zzy 2e0f6e7934 update：修改意见导出 2021-07-14 13:51:40 +08:00
yinglong zhang 8aed75a8f0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-07-13 15:36:33 +08:00
yinglong zhang 35d86a7222 feat 未合规项整改 2021-07-13 15:36:17 +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
yuezhihang d944ad54d7 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-07-13 10:34:16 +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
duanwenbin 718e261ff6 提交本地工具-标准拆分缺失的编辑接口 2021-07-12 18:10:11 +08:00
super_liu 51ed1c269d feat: 标准库 详情 文件类 修改 2021-07-12 18:09:24 +08:00
zj 55a47c6973 add:增加ProjectManager 2021-07-12 17:30:40 +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
yuezhihang 00798eb2b1 产品线 数据 2021-07-09 15:28:15 +08:00
yuezhihang aed855e336 Merge remote-tracking branch 'origin/develop_1' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java
 2021-07-09 14:33:21 +08:00
王夏晖 952c3ab02a Update application-dev.properties 2021-07-09 03:42:02 +00:00
zj 2ee918e1d0 add:关联ts_user表查询+分页 2021-07-09 11:38:19 +08:00
yinglong zhang 3b0fbb34d1 feat 改回注册中心配置 2021-07-09 11:05:46 +08:00
root ffe3b2b8c3 Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2 2021-07-09 09:50:15 +08:00
root 5bbf8556f6 fetch:数据处理 2021-07-09 09:49:38 +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
yuezhihang 4b8aac9bc4 标准 发布搞 2021-07-08 21:04:18 +08:00