 钮海涛
|
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 |
|
王杰
|
716e1f7df1
|
Merge branch 'test' into dev
|
5 years ago |
qianhs
|
3ffa9d06fa
|
sweb pojo 序列化提交
|
5 years ago |
汪云昊
|
717f268c28
|
POJO版本号还原
|
5 years ago |
|
王杰
|
a6e9b90026
|
pom
|
5 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
5 years ago |
|
王杰
|
eaecf4b4b7
|
pom
|
5 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
5 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
5 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
5 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
5 years ago |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
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 |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
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 |
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 |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
wei.peng
|
bec3a7098d
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
Silliter
|
9170083b17
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
33ef135392
|
采购订单表-条码明细表 字段修改 炉批号 改为 特殊批号
|
6 years ago |
wei.peng
|
5ba134126a
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
曾贞一
|
6845ef957b
|
bug #4330 工厂订单管理-订单管理 所有订单的已发布的历史记录都没有显示出来
|
6 years ago |
allen.zhang
|
9eb207145c
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
c164972238
|
已发布状态的订单，不支持打印 修改
|
6 years ago |
|
allen.zhang
|
a152d8d565
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
8a9e347f13
|
bug 修改
|
6 years ago |
|
allen.zhang
|
d714733a27
|
Merge branch 'dev' into test
|
6 years ago |
|
曾贞一
|
4e45f813dc
|
CS_ORDER_STATUS 枚举修改
DdlPreparedPack getNotInPack getNotInPackString 方法修改
|
6 years ago |
|
汪云昊
|
68c8c62542
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
yihang.lv
|
245596ee0b
|
sweb 导入非标准包装修改
|
6 years ago |
jenkins
|
a7833ea9dd
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |
|
yihang.lv
|
c5a4a5c023
|
sweb 订单按天发布
|
6 years ago |
|
yihang.lv
|
7db7dee50c
|
sweb 订单发布状态取子表
|
6 years ago |
|
yihang.lv
|
458cf3610f
|
sweb 订单发布修改子表状态
|
6 years ago |
|
jenkins
|
7c20f070e4
|
Merge remote-tracking branch 'origin/dev' into test
|
6 years ago |