 王杰
|
40836cafa4
|
Merge branch 'test' into ext-dev
|
4 years ago |
nies
|
f25fa6a2a6
|
新增userAccountType查询
|
4 years ago |
|
nies
|
5874e7e5b7
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
nies
|
187c1382ca
|
新增用户账号类型
|
4 years ago |
|
nies
|
945db7f238
|
合并代码
|
4 years ago |
|
nies
|
4c57d9e9b3
|
修改SysTableTemplate索引设置
|
4 years ago |
castle.zang
|
42a4d10770
|
sweb供应商自助修改密码
|
4 years ago |
|
castle.zang
|
3088b05027
|
sweb统一登录
|
4 years ago |
|
nies
|
34df681f37
|
新增前端列表模板类
|
4 years ago |
|
nies
|
8ebc96d1f7
|
sysMessage 查询增加organizeCode字段
|
4 years ago |
|
nies
|
d58b6715be
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
castle.zang
|
b81b9c569d
|
冷热数据分离--重构--测试完成
|
4 years ago |
|
nies
|
53a7709bc8
|
Merge branch 'test' into ext-dev
|
4 years ago |
|
castle.zang
|
94c61f77f4
|
冷热数据分离--重构
|
4 years ago |
|
nies
|
2418d6d655
|
修改ext-dev pojo版本为1.0.0.1
|
4 years ago |
|
castle.zang
|
8a369c31fa
|
通用数据冷热分离代码,并规范化test分支开发时的依赖，全部依赖1.0-TEST-SNAPSHOT
|
4 years ago |
|
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
|
代码回滚
|
5 years ago |
|
李俊生
|
206b522af5
|
pom冲突
|
5 years ago |
汪云昊
|
ec605315bb
|
Merge remote-tracking branch 'remotes/origin/test' into ext-dev
|
5 years ago |
|
汪云昊
|
862256e751
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
5 years ago |
|
汪云昊
|
9241c60f07
|
feat(mdm):通用导入导出及外部应用扩展
|
5 years ago |
|
wynne1005
|
afc0138e83
|
refactor(core): 支持用户密码过期
commit1 21.4.7
|
5 years ago |
|
汪云昊
|
1ef29d1fce
|
revert(pojo):还原pom版本
|
5 years ago |