 王杰
|
de9017ca5c
|
冲突
|
6 years ago |
|
王杰
|
eaecf4b4b7
|
pom
|
6 years ago |
 钮海涛
|
005d0f7f86
|
修复合并问题
|
6 years ago |
wei.peng
|
37922cab29
|
POM 文件修改
Merge remote-tracking branch 'remotes/origin/test'
# Conflicts:
# modules/i3plus-icloud-report/pom.xml
|
6 years ago |
|
钮海涛
|
a1eb3c3bc2
|
修复pom版本问题
|
6 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
6 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
|
6 years ago |
|
汪云昊
|
8a8c3ee34d
|
pom版本调整
|
6 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
|
钮海涛
|
3b987436d8
|
新增LES管理功能
|
6 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
6 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
6 years ago |
wynne1005
|
44696061ee
|
修改pom文件为最新
|
6 years ago |
|
wynne1005
|
286d605f09
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
6 years ago |
 曾贞一
|
5e2c592bbd
|
【IOT测试修改】
|
6 years ago |
|
曾贞一
|
1cf4943751
|
冲突解决
|
6 years ago |
|
曾贞一
|
77d7ac18ad
|
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
|
6 years ago |
|
wynne1005
|
2a619f69f8
|
将新pom提交到test
|
6 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
|
wynne1005
|
06551fdd66
|
还原pom
|
6 years ago |
|
曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
6 years ago |
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
王杰
|
42a22d14d3
|
安灯导出字=字段冗余
|
6 years ago |
|
王杰
|
7bc434ed15
|
安灯组装模型优化
|
6 years ago |
|
王杰
|
bc61b43e8d
|
安灯人员统计报表工位代码不显示问题修复
|
6 years ago |
|
王杰
|
3ff9fbc140
|
安灯图表
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
王杰
|
6da48220a5
|
Merge branch 'dev' into test
|
6 years ago |
crish
|
cba2cda2d4
|
安灯主界面部分字段赋初始值
|
6 years ago |
|
crish
|
06e969af1b
|
安灯主界面
|
6 years ago |
|
crish
|
74224b20ac
|
安灯主界面开发
|
6 years ago |
|
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
b2b16e2017
|
安灯工位分组配置
|
6 years ago |
|
crish
|
54ae351d91
|
安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
crish
|
5b6b303722
|
Merge branch 'test'
|
6 years ago |
|
crish
|
17d5f1e512
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
97958262b6
|
查询条件优化
|
6 years ago |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
王杰
|
9137555226
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
ad6baaa1e6
|
安灯通知方式调试， 日志调试
|
6 years ago |
jenkins
|
a7b751d9dc
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
4bd4ca8745
|
通知方式， 通知内容
|
6 years ago |
|
crish
|
a30f4aae83
|
andon广播音量可配置， 安灯通知记录
|
6 years ago |
许心洁
|
003ed70f98
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
aa22d18645
|
添加注解
|
6 years ago |
|
crish
|
577b2c462a
|
按照安灯类型统计当天发生的安灯总次数和安灯超时次数
|
6 years ago |
|
许心洁
|
ed7e002f6d
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
a294c1ccb0
|
安灯看板超时统计功能
|
6 years ago |