947 Commits (4ca08513862271a36e339881117279fab8cd93c7)

Author SHA1 Message Date
汪云昊 3474bb82c6 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 f978ee39c8 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 f6c1eff0f1 excel通用导入优化 6 years ago
汪云昊 d120b1615a 国际化工具类 6 years ago
jenkins ee979c6e02 Merge branch 'dev' into test 6 years ago
汪云昊 9caf9a4458 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
汪云昊 2f904f9eee 数据库适配器 6 years ago
汪云昊 c27449a185 异常信息国际化 6 years ago
jimmy.zeng d23045a667 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 5b6477bba6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 510485d2f0 excel导出优化--单据状态显示枚举描述 6 years ago
wei.peng 51974a46b9 WebService 调用发送邮件测试 6 years ago
crish 35beb0c60e Merge branch 'dev' into test 6 years ago
wei.peng 377a875fec 软适配客户端代码结构调整。 6 years ago
wei.peng fc1c7ab797 软适配添加-所有适配命令 接口 6 years ago
wei.peng 2c6b223628 软适配客户端代码结构调整。 6 years ago
wei.peng 212cfb02af Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 71798e9f51 软适配功能配置优化 6 years ago
汪云昊 eeff3517c6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts:
#	modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
#	modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
#	modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
6 years ago
汪云昊 07688db533 软适配实体 6 years ago
陈思洁 74bdaccfbd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
陈思洁 8ed0d4d60e 枚举维护业务类型数据 6 years ago
汪云昊 f2e2dd1670 软件适配器 数据源适配器
单号生成高并发优化
6 years ago
wei.peng 21241e45ca 软适配功能配置优化 6 years ago
刘敏 5144d15ac4 采购单报表开发 6 years ago
crish 4a1ad40dfa Merge branch 'dev' into test 6 years ago
wei.peng b899c5c8c5 软适配 WebService 功能接口开发 6 years ago
wei.peng e921bb72d2 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
 Conflicts:
	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
6 years ago
wei.peng 9ec5e63da6 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 5b200f824f 软适配 WebService 功能开发 6 years ago
汪云昊 3eef8ea750 Merge remote-tracking branch 'origin/dev' into dev 6 years ago
汪云昊 029d7eac62 软适配model 6 years ago
jimmy.zeng 2d376575a3 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
陈思洁 3c6d17a283 修改pojo数据类型 6 years ago
jimmy.zeng ccffe9b7bd Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
WYnneaoapc c44a99eb40 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
WYnneaoapc 61a7985afc 提交 0905 6 years ago
刘敏 5b97a9e0cb Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
刘敏 241a478f65 excel导出优化--单据状态显示枚举描述 6 years ago
crish 8d8752b8b4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 89b0a4a68a 条码打印调试
Signed-off-by: crish <570360737@qq.com>
6 years ago
刘敏 f0fba5e23a 盘点枚举添加--excel导出 6 years ago
曾贞一 b7bd96fa44 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 64aed1f49c 开发 Restful 接口测试PDA 6 years ago
jimmy.zeng 8f1ac3fdae Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
crish f370f377d4 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
crish 7ce78b170f 工作参数枚举
Signed-off-by: crish <570360737@qq.com>
6 years ago
jimmy.zeng 0a3339ba8d Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
刘敏 ff462900b7 枚举描述添加 6 years ago
jimmy.zeng 2e8a70d8b4 pom版本还原--pojo 6 years ago