钮海涛
b303cf9a14
修复合并问题
5 years ago
99d3c9d721
提测合并 还原pom
5 years ago
5ef88c80c0
提测合并 还原pom
5 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
5 years ago
王杰
786c442d55
解决冲突
5 years ago
钮海涛
c1241bd6c5
修复版本问题
5 years ago
钮海涛
53a421b3b9
修复版本问题
5 years ago
钮海涛
94e9b2ffec
Merge remote-tracking branch 'remotes/origin/master' into test
5 years ago
王杰
029763feb1
pom
5 years ago
王杰
30fcf4f23f
pom冲突
5 years ago
717f268c28
POJO版本号还原
5 years ago
9532489502
POJO添加序列化id
5 years ago
王杰
a6e9b90026
pom
5 years ago
王杰
de9017ca5c
冲突
5 years ago
王杰
7d192b36a6
pom冲突
5 years ago
钮海涛
da8b4db890
修复pom版本问题
5 years ago
0b3d2d6815
软适配REST 适配器调整优化
5 years ago
钮海涛
3fbf532c84
修复pom版本问题
5 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
5 years ago
c8197f3290
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
5 years ago
fb60d75eea
还原test pom
5 years ago
d6fe718e4c
Merge branch 'dev' into test
5 years ago
109c4429ce
还原dev pom
5 years ago
edf0b66115
Sonar代码缺陷修复
...
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
5 years ago
baaf16ad56
国际化工具类异常处理优化
5 years ago
钮海涛
efe083a9da
修复版本号
5 years ago
钮海涛
288fb4a16b
修改POM版本号
5 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
5 years ago
8a8c3ee34d
pom版本调整
5 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
5 years ago
aeda8d8287
版本调整
5 years ago
3069c5bf18
查询条件补充
5 years ago
ec1d52e7dd
MAVEN 版本控制调整
5 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
5 years ago
44696061ee
修改pom文件为最新
5 years ago
d80b341620
还原test pom
5 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
5 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
5 years ago
12579c7a14
还原pom
5 years ago
a76d70851d
软适配 适配记录参数 分页查询
5 years ago
1d9ab80ae8
数据源适配器 - 批量写入优化
5 years ago
d5c1f7a7a3
资源模块数据
...
模板软删除
软适配list传参
5 years ago
3dd247491a
软件适配器异常信息优化
5 years ago
47fb080742
lac线程超时监控优化
...
Session超时时间参数化
lac添加TaskCheck
日志添加索引
5 years ago
bc5beeba7d
添加适配记录索引
5 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
56381b76f1
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
26e7f975bf
数据源适配器支持IN
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
王杰
a595fed4fe
Merge branch 'test'
6 years ago
68f31721f0
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
2ad6d16684
参数重复校验错误
6 years ago
410558d43c
Merge branch 'test'
6 years ago
3d8421e1ec
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
423d8d2c03
日志开关
...
lac优化
OPC UA工具类
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
7863325afd
本地误拉了测试的代码，还原后提交，在测试分支拉开发分支的代码也得还原
6 years ago
b7b78b85ac
误拉了test分支的代码：还原
6 years ago
52a5fe74af
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
95a354f537
解决无法处理bug
6 years ago
722146acd8
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
9ac327e622
细节调整
6 years ago
f3867c64f4
软适配微服务接口
6 years ago
0924810e64
Merge branch 'test'
6 years ago
60d1798b9c
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
de685a0627
删除pojo数据默认值
6 years ago
1e41ab2e39
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
1defd0d8be
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
cecd37a1e7
添加Xml 工具
6 years ago
1d17198daf
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
d8c740819c
FTP适配器
6 years ago
7a403a37da
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
7e3edd06a0
Merge branch 'dev' into test
6 years ago
3b46d242a7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
...
Conflicts:
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
6 years ago
d830c78d03
FTP适配器
6 years ago
c0fc2c36bf
Socket 适配器完成
...
MQ 适配器完成
6 years ago
9ae6ee5016
Merge branch 'test'
6 years ago
790c0b4ec6
Merge branch 'dev' into test
6 years ago
c10bf2e3e1
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
0b8bc114bc
服务端调整
6 years ago
曾贞一
6c8cfd8678
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
曾贞一
a4262c5e1e
pom文件修改 dev改成test
6 years ago
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
41588f37d7
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c6badc59c6
适配记录添加id参数
6 years ago
f6bb2ee21f
Merge branch 'dev' into test
6 years ago
564deb4d6b
适配记录及数据库适配器
6 years ago
ee979c6e02
Merge branch 'dev' into test
6 years ago
9caf9a4458
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2f904f9eee
数据库适配器
6 years ago
d23045a667
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
a86f2e49c5
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
51974a46b9
WebService 调用发送邮件测试
6 years ago
35beb0c60e
Merge branch 'dev' into test
6 years ago
40a2a789be
参数描述调整
6 years ago
钮海涛
wynne1005
wei.peng
王杰
汪云昊
贾文涛
曾贞一
luweihao
crish
jenkins
许心洁
刘辉
于学杰
jimmy.zeng