WYnneaoapc
c34a369e93
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
ef1450e912
Merge branch 'dev' of http://git.estsh.com/i3-MES/i3plus-mes-pcn into dev
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
6 years ago
汪云昊
619251474d
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
f5c0ca9383
软适配模型调整
6 years ago
WYnneaoapc
c05e3b13c6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
63d86a4b0d
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
WYnneaoapc
ecba29948f
816 add method
6 years ago
汪云昊
69525fbaa9
表单菜单排序
6 years ago
汪云昊
7455c6c640
软适配配置文件初始化
6 years ago
wei.peng
46c710e559
表单功能优化,虚拟属性连表查询,时间格式化对接
6 years ago
wei.peng
6d99080069
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
汪云昊
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
wei.peng
66f49f3fdc
自定义表单功能调整
6 years ago
于学杰
4235184afc
Merge branch 'Process' into dev
6 years ago
于学杰
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确,修改为 DEV
6 years ago
于学杰
24da688384
Merge branch 'test' into dev
6 years ago
许心洁
31313baec9
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
曾贞一
b3a0a71065
库存初始化信息
6 years ago
许心洁
476d943a69
流程管家:自定义按钮触发的时候不需要预先调用当前步骤的回显信息
6 years ago
许心洁
40fc36ef18
流程管家优化:快速提交流程手动提交校验
6 years ago
许心洁
af7b2404dd
Merge branch 'Process' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Process
6 years ago
许心洁
d8786d8132
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
曾贞一
fb07628555
Merge branch 'dev' into test
6 years ago
汪云昊
c1cff11c7c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
peter.pan
d45b7b77f3
Merge branch 'dev' into test
6 years ago
许心洁
bb8078cb94
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
许心洁
7f3d902a30
流程管家:提交检验+预回显优化;
...
直送发运JOB:#5132
6 years ago
wei.peng
750e4d75dc
添加 XStream 插件
6 years ago
wei.peng
bda52f76c6
软适配 Json 请求适配完成
6 years ago
peter.pan
24bbd75c81
Merge branch 'dev' into test
6 years ago
曾贞一
c7571b4c66
IS_GENERAL_TASK 添加单据是否生成任务状态 撤销
6 years ago
许心洁
60e6d51d35
流程管家2.0
6 years ago
peter.pan
8f977719c0
Merge branch 'dev' into test
6 years ago
许心洁
5a7ce32761
冲突
6 years ago
wei.peng
b5c204f873
软适配接口制作完成
6 years ago
peter.pan
5c48b2eb79
Merge branch 'dev' into test
6 years ago
汪云昊
035a8b5924
定时任务日志信息优化
6 years ago
wei.peng
90439f55fd
添加 XStream 插件
6 years ago
wei.peng
c4db15db9b
添加 XStream 插件
6 years ago
peter.pan
8daa2789a4
Merge branch 'dev' into test
6 years ago
汪云昊
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
汪云昊
ccf0764ee6
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
jenkins
812be94ed3
Merge branch 'dev' into test
6 years ago
wei.peng
7f35883b08
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
wei.peng
90fb9d3190
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
wei.peng
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
jenkins
409cbb8492
Merge branch 'dev' into test
6 years ago
许心洁
4a717ec544
直送发运JOB+交易处理程序(下线结算)逻辑变动
6 years ago
jenkins
f4141fd2c6
Merge branch 'dev' into test
6 years ago
曾贞一
60feef4bb5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago