nies
|
0f92e2bbf9
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
211d20e840
|
修改打印模板复杂查询
|
4 years ago |
castle.zang
|
124cc7d729
|
Merge remote-tracking branch 'upstream/test' into test
|
4 years ago |
|
castle.zang
|
ace269e8aa
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
nies
|
f8d1d85c86
|
platform 增加job执行记录相关的bean
|
4 years ago |
|
castle.zang
|
f3190e6bbe
|
数据冷热分离pojo
|
4 years ago |
puxiao.liao
|
d7b34facf0
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
Conflicts:
modules/i3plus-pojo-andon/pom.xml
modules/i3plus-pojo-aps/pom.xml
modules/i3plus-pojo-base/pom.xml
modules/i3plus-pojo-bsp/pom.xml
modules/i3plus-pojo-form/pom.xml
modules/i3plus-pojo-hardswitch/pom.xml
modules/i3plus-pojo-ics/pom.xml
modules/i3plus-pojo-jobflow/pom.xml
modules/i3plus-pojo-lac/pom.xml
modules/i3plus-pojo-mdm/pom.xml
modules/i3plus-pojo-mes-pcn/pom.xml
modules/i3plus-pojo-mes/pom.xml
modules/i3plus-pojo-model/pom.xml
modules/i3plus-pojo-platform/pom.xml
modules/i3plus-pojo-ptl/pom.xml
modules/i3plus-pojo-report/pom.xml
modules/i3plus-pojo-screen/pom.xml
modules/i3plus-pojo-softswitch/pom.xml
modules/i3plus-pojo-sweb/pom.xml
modules/i3plus-pojo-wms/pom.xml
modules/i3plus-pojo-workflow/pom.xml
pom.xml
sonar-project.properties
|
4 years ago |
Dominic_Xiao
|
30eb4e2194
|
回滚POM版本
|
4 years ago |
nies
|
0b81a19bdc
|
Merge branch 'test' into dev
|
4 years ago |
|
puxiao.liao
|
c842d3e5e5
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
castle.zang
|
c3f473456b
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
Conflicts:
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogRoleChange.java
|
4 years ago |
|
castle.zang
|
6eff18d60b
|
松下用户角色更新记录表，字段长度过长报错,修改类型
|
4 years ago |
|
nies
|
0cda9012f2
|
Merge branch 'test' into dev
|
4 years ago |
|
nies
|
7755034dc8
|
修改SyslogRoleChange currentRoles 字段为TEXT类型
|
4 years ago |
wynne1005
|
bb88851f17
|
还原pom
|
4 years ago |
 王杰
|
fc8619208a
|
pom
|
4 years ago |
|
王杰
|
a71774ba24
|
pom
|
4 years ago |
|
王杰
|
21ca70f863
|
pom
|
4 years ago |
|
王杰
|
c6bc2e682a
|
Merge branch 'test' into dev
|
4 years ago |
jun
|
bda7b30475
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
4 years ago |
|
wynne1005
|
3544aa076e
|
天津it审核需求
|
4 years ago |
|
nies
|
b545d4928a
|
SYSMENU 新增字段
|
4 years ago |
|
wynne1005
|
321209f2b4
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
wynne1005
|
e7df36d3e9
|
还原merge pom
|
4 years ago |
|
wynne1005
|
261d5b3655
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
4 years ago |
|
wynne1005
|
2f1b184e9f
|
fix(impp): 格式化
格式化
|
4 years ago |
|
王杰
|
5d33795cff
|
test merge dev
|
4 years ago |
|
puxiao.liao
|
a001dae575
|
代码回滚
|
4 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
4 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
4 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
4 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
4 years ago |
|
wynne1005
|
afc0138e83
|
refactor(core): 支持用户密码过期
commit1 21.4.7
|
4 years ago |
|
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
4 years ago |
andly.pan
|
754124ff25
|
Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into pext-dev
|
4 years ago |
|
wynne1005
|
1f94eee641
|
Merge branch 'dev' into test
|
4 years ago |
|
wynne1005
|
6318ca6afc
|
feat(form): 动态表单新增跳转详情页枚举
|
4 years ago |
|
王杰
|
2b89e35c69
|
pom
|
4 years ago |
许心洁
|
410b95aefd
|
Merge branches 'master' and 'test' of http://git.estsh.com/i3-WMS/i3plus-wms
# Conflicts:
# modules/i3plus-wms-apiservice/pom.xml
|
4 years ago |
|
王杰
|
5a5874b137
|
test
|
4 years ago |
|
王杰
|
84d9ec15f2
|
pom
|
4 years ago |
|
王杰
|
f1db936f42
|
pom
|
4 years ago |
|
许心洁
|
d107c7a3fe
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
|
4 years ago |
肖奕扬
|
0ee06f6e03
|
Merge branch 'test' of i3-IMPP/i3plus-pojo into ext-dev
|
4 years ago |
|
汪云昊
|
b03d4bf573
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |
|
汪云昊
|
cb9add43a3
|
feat(sms):短信模型，枚举调整
|
4 years ago |
 钮海涛
|
2740830e8f
|
合并test代码
|
4 years ago |
 曾贞一
|
bbd5dccbf8
|
【合并分支】
|
4 years ago |
|
钮海涛
|
d301332162
|
合并dev代码
|
4 years ago |
|
汪云昊
|
2cfbe85ab6
|
Merge remote-tracking branch 'origin/dev' into test
|
4 years ago |