1534 Commits (yun-zuoyi)
 

Author SHA1 Message Date
alwaysfrin 4fac35c583 结构错误 7 years ago
alwaysfrin 6f276de76f 结构错误 7 years ago
wei.peng 12f1dfb021 测试数据库切换 7 years ago
yunhao.wang 696678930c 单号规则管理excel导入导出 7 years ago
wei.peng 879683a646 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
7 years ago
wei.peng 9affe5c611 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
7 years ago
wei.peng dfbc0b5eeb Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
7 years ago
wei.peng b382c5ae00 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
7 years ago
wei.peng b32d868279 Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into test
# Conflicts:
#	modules/i3plus-core-api/pom.xml
#	modules/i3plus-core-apiservice/pom.xml
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
#	pom.xml
7 years ago
wei.peng c98297b3da 发布 正式版本 1.0 7 years ago
wei.peng 42a9154afe 发布 正式版本 1.0 7 years ago
yunhao.wang 9db39d97cd Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties
7 years ago
yunhao.wang b6caf12c92 test数据库配置 7 years ago
yunhao.wang dbf65a91da dev数据库配置 7 years ago
yunhao.wang b84402a40a 数据库配置 7 years ago
wei.peng fcc97cb438 发布 正式版本 1.0 7 years ago
wei.peng 850ea37153 发布 正式版本 1.0 7 years ago
yunhao.wang 126e23e3cd 项目pom版本更新为test 7 years ago
wei.peng d53cd353dd Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 673f6bcc3d 发布 正式版本 1.0 7 years ago
yunhao.wang 74c78570ed 项目pom版本更新为dev 7 years ago
wei.peng 16c2012fc7 打包处理 7 years ago
yunhao.wang 7a0657665e Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang a57c4ee19e Excel导入导出 7 years ago
wei.peng 402bca0a8c 代码优化 7 years ago
jimmy 7c90e3f1d2 提交代码 7 years ago
Silliter 13f2b51221 优化代码 7 years ago
yunhao.wang c091f1ad05 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang b15b09df52 单号规则初始化 7 years ago
amy 5fe4b562e9 按钮权限添加 7 years ago
gragon.xu 5cafca1840 权限excel 7 years ago
jimmy 0a46fe045a 权限按钮 7 years ago
alwaysfrin 151717db13 Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin d1ff081470 重复idbug解决 7 years ago
yunhao.wang 129de18e45 Merge remote-tracking branch 'origin/master' 7 years ago
yunhao.wang 8ed83d0c39 资源管理,硬件管理细节处理 7 years ago
frin.fei ddd1be828c 集群心跳机制 7 years ago
frin.fei 65d633bad9 参数配置调整 7 years ago
wei.peng c1decc086e 登录功能优化 7 years ago
wei.peng e6a734ea27 测试环境配置信息修改 7 years ago
wei.peng 60dd3a56aa Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 6a521dee37 异常处理优化 7 years ago
alwaysfrin 7b880d6eda Merge remote-tracking branch 'origin/master' 7 years ago
alwaysfrin 1b8f4c01ba 微服调用调整 7 years ago
wei.peng e1233e9361 功能代码优化 7 years ago
wei.peng 9bf2152762 Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core 7 years ago
wei.peng 28b17c83a6 功能代码优化 7 years ago
yunhao.wang b26279be1d Merge remote-tracking branch 'origin/master'
# Conflicts:
#	modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java
7 years ago
yunhao.wang 5b154b40df 字典管理优化 7 years ago
wei.peng 063c1dfb5c Merge remote-tracking branch 'origin/master' 7 years ago