 王杰
|
c6aefc89e7
|
test合并dev解决ct
|
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 |
wynne1005
|
44696061ee
|
修改pom文件为最新
|
5 years ago |
|
wynne1005
|
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 |
luweihao
|
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
|
添加适配记录索引
|
6 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 |
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
jenkins
|
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 |
|
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
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 |
|
crish
|
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 |
wei.peng
|
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 |
|
jenkins
|
7e3edd06a0
|
Merge branch 'dev' into test
|
6 years ago |