85f99fcdfa
提测 还原pom
5 years ago
b43317c11a
还原pom
5 years ago
8955fd2f4d
mes提测 还原pom
5 years ago
23754d3f18
mes提测 还原pom
5 years ago
99d3c9d721
提测合并 还原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
钮海涛
53a421b3b9
修复版本问题
5 years ago
王杰
a6e9b90026
pom
5 years ago
王杰
de9017ca5c
冲突
5 years ago
王杰
7d192b36a6
pom冲突
5 years ago
钮海涛
005d0f7f86
修复合并问题
5 years ago
37922cab29
POM 文件修改
...
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
5 years ago
fe94ad9bf3
Merge remote-tracking branch 'remotes/origin/test'
5 years ago
钮海涛
a1eb3c3bc2
修复pom版本问题
5 years ago
钮海涛
2cc43af431
修复pom版本问题
5 years ago
钮海涛
c6d36af4c9
Merge branch 'master' into test
5 years ago
fb60d75eea
还原test pom
5 years ago
d6fe718e4c
Merge branch 'dev' into test
5 years ago
109c4429ce
还原dev pom
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
钮海涛
82d5332861
修复POM文件问题
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
王杰
cfa54aa2b6
修改pom
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
6ebc22e6cc
master分支配置调整
6 years ago
adfe3cb2e6
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
ef6d24682e
自定义报表 代码优化
...
软适配 项目初始化增删改
6 years ago
8ba027cff5
DEV to TEST
6 years ago
f775968194
扩展块功能
6 years ago
wynne1005
wei.peng
钮海涛
王杰
汪云昊
贾文涛
曾贞一
luweihao
wei.peng
alwaysfrin