7aaa8bca6d
合并dev分支代码到test分支
5 years ago
adb95f100f
Ics 日志收集功能完成
5 years ago
b43317c11a
还原pom
5 years ago
4150543cb4
Effort Task #1940 Cost:16h Left:8h
6 years ago
8955fd2f4d
mes提测 还原pom
6 years ago
23754d3f18
mes提测 还原pom
6 years ago
99d3c9d721
提测合并 还原pom
6 years ago
6169542dbb
合并代码 有代码丢失或者文件丢失请排查此处
...
Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts:
# modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
6 years ago
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
6 years ago
王杰
786c442d55
解决冲突
6 years ago
钮海涛
c1241bd6c5
修复版本问题
6 years ago
钮海涛
53a421b3b9
修复版本问题
6 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
6 years ago
王杰
029763feb1
pom
6 years ago
王杰
30fcf4f23f
pom冲突
6 years ago
王杰
716e1f7df1
Merge branch 'test' into dev
6 years ago
c288b54660
查询优化
6 years ago
717f268c28
POJO版本号还原
6 years ago
8fe0244a20
POJO添加序列化id
6 years ago
9532489502
POJO添加序列化id
6 years ago
3669fbb4a4
本地版本库雪崩,有问题请排查此版本
6 years ago
王杰
a6e9b90026
pom
6 years ago
王杰
de9017ca5c
冲突
6 years ago
王杰
eaecf4b4b7
pom
6 years ago
王杰
7d192b36a6
pom冲突
6 years ago
钮海涛
005d0f7f86
修复合并问题
6 years ago
钮海涛
bc269e1f71
Merge branch 'master' into test
6 years ago
27e4fb164b
Merge branch 'dev' into test
6 years ago
32460a3272
sqlserver 适配处理，in 参数类型不准确
6 years ago
2ab9045d17
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
30c0b2e46a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
d4a91b6d69
缺失资源接口优化
6 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
6 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
6 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
6 years ago
3aa1afb0ce
对象历史记录 Pojo 创建
6 years ago
c8197f3290
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
6 years ago
9d3a4db040
日志查询Bug 修复
6 years ago
fee90baf64
1. 关闭register , gateway , console 日志持久化技术
...
2. Sonar Bug 修复
3. 自定义日志持久化
6 years ago
effae233bf
对象历史记录 Pojo 创建
6 years ago
fe46d8da29
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
6 years ago
69346da06d
日志查询Bug 修复
6 years ago
dac1358009
1. 关闭register , gateway , console 日志持久化技术
...
2. Sonar Bug 修复
3. 自定义日志持久化
6 years ago
d6fe718e4c
Merge branch 'dev' into test
6 years ago
edf0b66115
Sonar代码缺陷修复
...
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
6 years ago
钮海涛
efe083a9da
修复版本号
6 years ago
钮海涛
288fb4a16b
修改POM版本号
6 years ago
钮海涛
aff68cd087
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2772ea6a2f
Merge remote-tracking branch 'remotes/origin/dev' into test
...
# Conflicts:
# modules/i3plus-pojo-andon/pom.xml
# modules/i3plus-pojo-aps/pom.xml
# modules/i3plus-pojo-base/pom.xml
# modules/i3plus-pojo-form/pom.xml
# modules/i3plus-pojo-hardswitch/pom.xml
# modules/i3plus-pojo-jobflow/pom.xml
# modules/i3plus-pojo-lac/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-softswitch/pom.xml
# modules/i3plus-pojo-sweb/pom.xml
# modules/i3plus-pojo-wms/pom.xml
# modules/i3plus-pojo-workflow/pom.xml
# pom.xml
6 years ago
8a8c3ee34d
pom版本调整
6 years ago
袁津哲
wei.peng
wynne1005
王杰
钮海涛
汪云昊