 super_liu
|
de97f459fd
|
feat: 标准入库流程 带入 逻辑
|
2021-07-15 17:14:54 +08:00 |
|
|
super_liu
|
9930cbae9b
|
feat: 添加企业标准库 接口服务
|
2021-07-13 14:25:06 +08:00 |
|
|
super_liu
|
51ed1c269d
|
feat: 标准库 详情 文件类 修改
|
2021-07-12 18:09:24 +08: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 |
|
|
yuezhihang
|
0a5b8d8580
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 20:17:00 +08:00 |
|
|
zzy
|
04792ee931
|
add:分解单查询
|
2021-07-08 20:05:12 +08:00 |
|
|
zzy
|
e998809767
|
add:分解单查询
|
2021-07-08 20:04:47 +08:00 |
|
|
yuezhihang
|
dfc10e4b0f
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-08 19:38:54 +08:00 |
|
|
root
|
7fda1c196c
|
fetch:我的板块改为二级菜单
|
2021-07-08 18:53:33 +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
|
521c81c8bb
|
Merge branch 'develop_1' into 'develop_master'
update:优化查询速度
See merge request !16
|
2021-07-08 06:19:52 +00:00 |
|
|
yuezhihang
|
bee6ef8a8a
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 14:15:16 +08:00 |
|
|
yuezhihang
|
035b294423
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-07-08 14:14:51 +08:00 |
|
|
yuezhihang
|
c611fc2234
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-08 14:07:30 +08:00 |
|
|
zj
|
8aade0862c
|
add:产品线项目经理
|
2021-07-08 14:06:07 +08:00 |
|
|
super_liu
|
f59419de62
|
feat: 数据字典 树形结构
|
2021-07-08 14:00:51 +08:00 |
|
|
duanwenbin
|
2e8a2bba51
|
提交本地工具-标准拆分相关接口
|
2021-07-08 11:21:18 +08:00 |
|
|
duanwenbin
|
1ed0888256
|
提交ocr模块配置
|
2021-07-08 09:22:56 +08:00 |
|
|
zzy
|
0c8df99fd2
|
update:优化查询速度
|
2021-07-08 09:17:52 +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 |
|
|
root
|
fb05c70666
|
test
|
2021-07-07 10:52:45 +08:00 |
|
|
王夏晖
|
3c7acb2705
|
Update application-dev.properties
|
2021-07-07 02:21:45 +00:00 |
|
|
yinglong zhang
|
b39fda6c43
|
feat 改回注册中心配置
|
2021-07-07 09:55:52 +08:00 |
|
|
yinglong zhang
|
f91b481180
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
|
2021-07-07 09:54:08 +08:00 |
|
|
yinglong zhang
|
9a00280ba0
|
feat 改回注册中心配置
|
2021-07-07 09:53:29 +08:00 |
|
|
yuezhihang
|
9f856079ee
|
标准清单入库 bug修复
|
2021-07-06 20:14:34 +08:00 |
|
|
yuezhihang
|
b4c0465f18
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-06 19:12:25 +08:00 |
|