1825cfbdf3
revert(pojo):还原pom版本
5 years ago
钮海涛
582ef23ca3
修复SWEB问题
5 years ago
钮海涛
63a06fcc27
修改供应商端登录及供应商端代码重构
5 years ago
钮海涛
66c55386ee
修复sweb的bug
5 years ago
钮海涛
445821b803
sweb问题修复
5 years ago
钮海涛
5a0178f5df
合并dev代码
5 years ago
钮海涛
af4bb83f85
sweb合并test代码
5 years ago
钮海涛
401e38203a
Merge remote-tracking branch 'remotes/origin/test' into dev
5 years ago
钮海涛
c202fa073b
修改sweb问题
5 years ago
钮海涛
1695d75ff2
合并dev代码
5 years ago
钮海涛
94568777fb
合并test代码
5 years ago
171f39cf01
revert:还原pojo pom.xml报表
5 years ago
钮海涛
543058b3a5
合并sweb代码
5 years ago
钮海涛
0ce944ec5f
Merge remote-tracking branch 'remotes/origin/test' into dev
5 years ago
钮海涛
73809df827
合并swebtest代码
5 years ago
钮海涛
c4f161e958
Start Task #2795
5 years ago
钮海涛
0d0905c454
sweb合并dev代码
5 years ago
钮海涛
fa467a2e0d
sweb合并dev代码
5 years ago
钮海涛
5f144781c9
SWEB合并test代码
5 years ago
钮海涛
6749bda558
合并dev代码
5 years ago
钮海涛
ea875c1a3b
SWEB功能开发
5 years ago
钮海涛
e6b472bcfd
合并test代码到dev
5 years ago
钮海涛
92f0158dab
合并master代码
5 years ago
钮海涛
310da99743
合并master代码
5 years ago
钮海涛
dd7347d352
Sweb功能开发
5 years ago
钮海涛
54b0af00cc
Sweb功能开发
5 years ago
钮海涛
7ca3b43bfe
合并DEV分支代码
5 years ago
钮海涛
b04ef3caa4
合并TEST分支代码
5 years ago
钮海涛
ef40f20e1d
解决合并冲突
5 years ago
钮海涛
81266fbfb6
解决合并冲突
5 years ago
钮海涛
9a516f893f
合并dev代码到test
5 years ago
钮海涛
6033695b99
修复合并版本问题
5 years ago
085f15427d
还原pom
5 years ago
dfa993b9e9
还原pom
5 years ago
15f0a37508
还原pom
5 years ago
bcb4e5ad13
merge test
5 years ago
31b5f3e234
merge dev 还原pom
5 years ago
b18408b3bb
merge test
5 years ago
b0b07437d6
还原pom
5 years ago
60c1f6ecab
还原pom
5 years ago
47ae0b46ef
还原pom
5 years ago
adb974d874
合并test分支代码到dev分支
5 years ago
钮海涛
ae805a6596
修复Bug
5 years ago
0067e31420
合并test分支代码到dev分支
5 years ago
钮海涛
2f8b0ba5db
修复版本问题
5 years ago
钮海涛
a71d7a31ce
Merge branch 'master' into test
5 years ago
钮海涛
5a0fea01ca
修复版本问题
5 years ago
钮海涛
6061f89d43
修复合并版本问题
5 years ago
b43317c11a
还原pom
5 years ago
钮海涛
3a40d278ac
修复平台登录问题
5 years ago
钮海涛
470bceac6a
Start Task #1973 Cost:2h
...
Start Task #1971 Cost:2h
Start Task #1970 Cost:2h
Effort Task #1968 Cost:4h
5 years ago
钮海涛
f1a6f66ccb
Merge remote-tracking branch 'origin/dev' into dev
5 years ago
钮海涛
15a3d95c61
Start Task #1968 Cost:3h
5 years ago
钮海涛
47131ff13f
修复版本问题
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
王杰
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
王杰
716e1f7df1
Merge branch 'test' into dev
5 years ago
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
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
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
bec3a7098d
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
9170083b17
Merge branch 'dev' into test
6 years ago
曾贞一
33ef135392
采购订单表-条码明细表 字段修改 炉批号 改为 特殊批号
6 years ago
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
9eb207145c
Merge branch 'dev' into test
6 years ago
曾贞一
c164972238
已发布状态的订单，不支持打印 修改
6 years ago
a152d8d565
Merge branch 'dev' into test
6 years ago
曾贞一
8a9e347f13
bug 修改
6 years ago
d714733a27
Merge branch 'dev' into test
6 years ago
曾贞一
4e45f813dc
CS_ORDER_STATUS 枚举修改
...
DdlPreparedPack getNotInPack getNotInPackString 方法修改
6 years ago
汪云昊
钮海涛
wynne1005
袁津哲
wei.peng
王杰
qianhs
贾文涛
曾贞一
luweihao
wei.peng
allen.zhang