jenkins
|
298a3c1ddf
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
Silliter
|
e38a7de8ea
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
 曾贞一
|
c84df68fac
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
曾贞一
|
81821c70a8
|
移库单 生成条码问题
|
6 years ago |
柯裕
|
9ee049e086
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
柯裕
|
5ef8089c02
|
ANDON实体创建
|
6 years ago |
|
柯裕
|
30db0904a4
|
ANDON实体创建
|
6 years ago |
|
Silliter
|
2b37ad77c5
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
c5093b073c
|
安灯实体优化
|
6 years ago |
许心洁
|
37efbf718e
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
4cf5fbc2b7
|
#4091+流程配置复制流程+作业步骤参数，作业组件，作业组件参数，作业流程基础数据接口代码调整
|
6 years ago |
|
Silliter
|
24af646ad8
|
安灯项目开发环境搭建
|
6 years ago |
|
Silliter
|
5ffc366dd0
|
Merge branch 'dev' into test
|
6 years ago |
|
Silliter
|
10844622a7
|
1.优化查询语句
2.流程管家查询条件加上工厂字段
|
6 years ago |
|
Silliter
|
20afd08ba7
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
yihang.lv
|
58bc54f3c6
|
sweb 订单发布代码修改bug
|
6 years ago |
|
yihang.lv
|
e0383285b4
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
yihang.lv
|
e93605135c
|
sweb 发布列表重写
|
6 years ago |
yunhao.wang
|
58247fe3f1
|
清除iml
|
6 years ago |
|
许心洁
|
c03810358b
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
58c29f5aee
|
作业流程接口+作业组件接口联调优化
|
6 years ago |
wei.peng
|
521f474753
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
# modules/i3plus-block-form/src/main/resources/application-test.properties
# modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
|
6 years ago |
|
wei.peng
|
f5307b5ab3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
7349c5fb3a
|
添加注释
|
6 years ago |
|
Silliter
|
4e9a8ab787
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
6 years ago |
|
许心洁
|
24d115be6d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
35690ce138
|
作业流程界面+后端分页查询接口
|
6 years ago |
|
Silliter
|
0a36f9130f
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
jimmy
|
bc1b0b7e90
|
业务类型表 字段数据类型修改
|
6 years ago |
|
Silliter
|
b2c5494983
|
联调系统配置接口
|
6 years ago |
|
Silliter
|
7e58ced783
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
jimmy
|
fc15efe67c
|
开发业务类型增删改查接口
|
6 years ago |
|
Silliter
|
29b605c749
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
wei.peng
|
5eee153b0b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
8e2bf96a14
|
找回丢失代码
|
6 years ago |
jiajack
|
7728bbf61c
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
jiajack
|
9137fe9c4f
|
工位程序业务编写
|
6 years ago |
|
Silliter
|
c99d7aec25
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
Silliter
|
da5c5e55b8
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
Silliter
|
733b65e8d5
|
流程管家优化：1.缓存重新规划
2.重入保存上一步的回显
|
6 years ago |
|
许心洁
|
9fc74bb145
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
0c9d987127
|
交易类型-作业流程开窗查询路径修改+流程配置组件-按条件查询返回ResultBean
|
6 years ago |
|
jenkins
|
12e2f1d1b8
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
wei.peng
|
91b5485951
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
7ded95fb51
|
配置文件优化 禁止提交配置文件防止环境错乱
|
6 years ago |
|
许心洁
|
85a44b1baa
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
许心洁
|
19f30ce4f9
|
流程配置+定时处理错误移动单给错误信息赋值过长
|
6 years ago |
|
jenkins
|
0c7b87bf24
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yihang.lv
|
ef4acdbb00
|
sweb测试环境版本配置修改pojo
|
6 years ago |