2748 Commits (483ea5914290f6046448fac95de59f4d5809d0b7)
 

Author SHA1 Message Date
jimmy.zeng 483ea59142 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish 3711873c29 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc c34a369e93 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 9d70008912 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 61ce4d1b3f 优化 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
crish 6c37a60ff4 MES-PCN获取平台打印数据
Signed-off-by: crish <570360737@qq.com>
6 years ago
jimmy.zeng ef40914935 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 e9c596adce 盘点hql排序修改 6 years ago
jimmy.zeng 02baed5dbf Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 4573b09392 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 2058789438 盘点业务修改bug 6 years ago
jimmy.zeng 41efa29098 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 94924cb264 POJO 合并 6 years ago
wei.peng 718ec36747 POJO 合并 6 years ago
wei.peng 41aff3b560 `` 6 years ago
jimmy.zeng 7002ac5a8a Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 619251474d Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 f5c0ca9383 软适配模型调整 6 years ago
曾贞一 abf155ecd9 库存报表 创建人、创建时间添加 6 years ago
WYnneaoapc c05e3b13c6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 391d0129e1 Merge remote-tracking branch 'origin/dev' 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
jimmy.zeng 221f05b175 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 69525fbaa9 表单菜单排序 6 years ago
刘敏 839c139222 库存移动条码报表优化 6 years ago
jimmy.zeng 235498b162 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 638d9cb1a1 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 9ff9c11c97 字段调整 6 years ago
jimmy.zeng b0d2812778 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 409c433b5c 添加字典分组 6 years ago
汪云昊 42f067b987 软适配参数接口 6 years ago
曾贞一 eb035aeaf6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 cf5aded9d9 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 05b9298dec 软适配Repository初始化 6 years ago
曾贞一 cef48801df Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
许心洁 a713e835fd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 7455c6c640 软适配配置文件初始化 6 years ago
汪云昊 f82011cf5b 实体 6 years ago
汪云昊 1c98f0a3c4 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 dc78cf114f 实体 6 years ago
wei.peng aee54acafc Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng 46c710e559 表单功能优化,虚拟属性连表查询,时间格式化对接 6 years ago
wei.peng 68e4b74e0a 平台权限系功能优化 6 years ago
wei.peng 6d99080069 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
曾贞一 ff52a412d4 库存初始化信息 6 years ago
陈思洁 2860edf722 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 b604c5d9a0 交易记录增加字段 6 years ago
许心洁 374c2bf76c Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago