74 Commits (d07173bd642de4b551714095dbd08f7fe14f9867)

Author SHA1 Message Date
曾贞一 6c8cfd8678 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
曾贞一 a4262c5e1e pom文件修改 dev改成test 6 years ago
crish b473fd1b46 pojo开发环境 pom文件修改为dev 6 years ago
crish 87f8dc38a6 测试环境 6 years ago
crish d82e025eb9 dev环境pom文件修改为dev 6 years ago
wei.peng 41588f37d7 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 c6badc59c6 适配记录添加id参数 6 years ago
于学杰 f6bb2ee21f Merge branch 'dev' into test 6 years ago
汪云昊 564deb4d6b 适配记录及数据库适配器 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
jimmy.zeng d23045a667 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
wei.peng a86f2e49c5 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev 6 years ago
wei.peng 51974a46b9 WebService 调用发送邮件测试 6 years ago
crish 35beb0c60e Merge branch 'dev' into test 6 years ago
汪云昊 40a2a789be 参数描述调整 6 years ago
wei.peng 1661e4e0a9 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
6 years ago
汪云昊 8b0e851eb8 数据源适配套件相关接口 6 years ago
wei.peng 2c6b223628 软适配客户端代码结构调整。 6 years ago
汪云昊 f718a5dac5 excel通用导入优化 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
汪云昊 f2e2dd1670 软件适配器 数据源适配器
单号生成高并发优化
6 years ago
crish bbfc9b320f Merge branch 'test' 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 5b200f824f 软适配 WebService 功能开发 6 years ago
汪云昊 029d7eac62 软适配model 6 years ago
许心洁 04f8aaa783 Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test 6 years ago
汪云昊 eadb86ce60 excel通用导入优化 6 years ago
曾贞一 ae12af551b Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 1b06c1d07f Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 2325d18660 软件适配器 认证参数接口 6 years ago
jimmy.zeng c901f18f89 pom版本还原 6 years ago
wei.peng f6b49bf31a Merge remote-tracking branch 'remotes/origin/test' 6 years ago
wei.peng 9bea065f35 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
曾贞一 b10b967b73 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
wei.peng d7b0f30d91 IMPP 平台功能功能优化 . 软适适配功能开发 6 years ago
jimmy.zeng a2a4dc6beb Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 7eed51791f 软件适配器-定时适配任务 6 years ago
曾贞一 7fab9a4d89 Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 0d532b78c0 Merge remote-tracking branch 'remotes/origin/dev' into test 6 years ago
汪云昊 02d60ed1a8 软件适配器-数据适配转换 6 years ago
汪云昊 b9d9d7402e Merge remote-tracking branch 'remotes/origin/test' 6 years ago
jimmy.zeng 41efa29098 Merge remote-tracking branch 'remotes/origin/dev' into test 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