 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
|
369e1532bc
|
update：增加意见详情查询字段
add：分解单查询时间
|
2021-07-15 16:41:37 +08:00 |
|
|
王夏晖
|
f52e33fa3c
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !32
|
2021-07-15 06:24:04 +00:00 |
|
|
super_liu
|
9930cbae9b
|
feat: 添加企业标准库 接口服务
|
2021-07-13 14:25:06 +08:00 |
|
|
zj
|
55a47c6973
|
add:增加ProjectManager
|
2021-07-12 17:30:40 +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 |
|
|
zj
|
2ee918e1d0
|
add:关联ts_user表查询+分页
|
2021-07-09 11:38:19 +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 |
|
|
yuezhihang
|
0a5b8d8580
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 20:17:00 +08:00 |
|
|
zzy
|
e998809767
|
add:分解单查询
|
2021-07-08 20:04:47 +08:00 |
|
|
root
|
142ff05355
|
fetch:我的板块bug
|
2021-07-08 16:58:00 +08:00 |
|
|
root
|
e73e07d681
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-08 15:55:00 +08:00 |
|
|
duanwenbin
|
4bfbd48dc6
|
提交本地工具-标准比对的相关接口
|
2021-07-08 15:50:05 +08:00 |
|
|
root
|
9020a2782f
|
Merge branch 'develop_master' of http://101.36.229.190:90/LiuChao/foton-slrs-system-rest into develop_2
|
2021-07-08 15:46:53 +08:00 |
|
|
root
|
9432d1a2f4
|
fetch:我的模块数据
|
2021-07-08 15:46:19 +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
|
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 |
|