wei.peng
|
a99527f52e
|
冲突解决 合并代码
|
7 years ago |
|
wei.peng
|
ee46a7913b
|
Merge branch 'dev' into test
|
7 years ago |
|
wei.peng
|
e9b01fe54e
|
remove .idea
|
7 years ago |
|
wei.peng
|
270c7869f3
|
remove .idea
|
7 years ago |
|
wei.peng
|
e02cf694b0
|
remove *.iml
|
7 years ago |
|
wei.peng
|
b524929d7e
|
Base Url 修改
|
7 years ago |
|
wei.peng
|
ba940403fa
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
67873a6210
|
配置文件修改 Test to dev
|
7 years ago |
|
wei.peng
|
c4447414d1
|
合并代码 并打开 MQ 以及邮箱
|
7 years ago |
|
wei.peng
|
0a1c9649b3
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
wei.peng
|
453caba58a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-core into dev
|
7 years ago |
|
wei.peng
|
bfd3809daf
|
用户功能优化
|
7 years ago |
alwaysfrin
|
8938b70866
|
调整
|
7 years ago |
|
alwaysfrin
|
bcf28a2f7d
|
调整
|
7 years ago |
|
alwaysfrin
|
8d8203aafc
|
结构错误
|
7 years ago |
|
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
|
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 |