钮海涛
b303cf9a14
修复合并问题
5 years ago
钮海涛
96fdbe0e07
Merge branch 'master' into test
5 years ago
608aa6be90
还原pom
5 years ago
99d3c9d721
提测合并 还原pom
5 years ago
6dd2f12a2a
Merge branch 'dev' into test
5 years ago
5ef88c80c0
提测合并 还原pom
5 years ago
王杰
56ae714283
【任务：1845，安灯】
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
王杰
fc99ee8914
pojo 序列化
5 years ago
王杰
30fcf4f23f
pom冲突
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
钮海涛
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
钮海涛
3b987436d8
新增LES管理功能
5 years ago
ec1d52e7dd
MAVEN 版本控制调整
5 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
5 years ago
44696061ee
修改pom文件为最新
5 years ago
286d605f09
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
d80b341620
还原test pom
5 years ago
曾贞一
5e2c592bbd
【IOT测试修改】
5 years ago
曾贞一
1cf4943751
冲突解决
5 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
5 years ago
2a619f69f8
将新pom提交到test
5 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
5 years ago
06551fdd66
还原pom
5 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
5 years ago
12579c7a14
还原pom
5 years ago
王杰
42a22d14d3
安灯导出字=字段冗余
5 years ago
王杰
7bc434ed15
安灯组装模型优化
5 years ago
王杰
bc61b43e8d
安灯人员统计报表工位代码不显示问题修复
5 years ago
王杰
3ff9fbc140
安灯图表
5 years ago
王杰
cfa54aa2b6
修改pom
6 years ago
王杰
6da48220a5
Merge branch 'dev' into test
6 years ago
cba2cda2d4
安灯主界面部分字段赋初始值
6 years ago
06e969af1b
安灯主界面
6 years ago
74224b20ac
安灯主界面开发
6 years ago
4d3adf5daf
Merge branch 'dev' into test
6 years ago
b2b16e2017
安灯工位分组配置
6 years ago
54ae351d91
安灯任务管理界面查询代码优化， 解决安灯任务， 开发信号发送逻辑
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
5b6b303722
Merge branch 'test'
6 years ago
17d5f1e512
Merge branch 'dev' into test
6 years ago
97958262b6
查询条件优化
6 years ago
410558d43c
Merge branch 'test'
6 years ago
王杰
9137555226
Merge branch 'dev' into test
6 years ago
ad6baaa1e6
安灯通知方式调试， 日志调试
6 years ago
a7b751d9dc
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
4bd4ca8745
通知方式， 通知内容
6 years ago
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
aa22d18645
添加注解
6 years ago
577b2c462a
按照安灯类型统计当天发生的安灯总次数和安灯超时次数
6 years ago
ed7e002f6d
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
a294c1ccb0
安灯看板超时统计功能
6 years ago
c4d7a2380c
Merge branch 'test'
6 years ago
017cd18950
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1a7fda268b
andon 系统配置
6 years ago
c79786a677
合并开发分支的代码POM文件被改成DEV修改回TEST
6 years ago
18161e8191
Merge branch 'test'
6 years ago
67461457fc
Merge branch 'dev' into test
6 years ago
1e0f0c706c
安灯问题修复
6 years ago
4eaa8b5b17
导入导出
6 years ago
6902c79472
问题清单问题修复
6 years ago
7d8b8664cc
问题清单问题修复
6 years ago
0c20a2b655
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
0824a58ead
安灯定时自处理job, 广播播报内容优化
6 years ago
15e812c7a6
Merge branch 'test'
6 years ago
7d20321be5
Merge branch 'dev' into test
6 years ago
901e37d6e7
修复bug
6 years ago
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
bdb818930b
安灯广播，自处理
6 years ago
e89df89f9a
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
9e4930968f
解决冲突
6 years ago
febbea09c3
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
0fdabe4950
知识库 ，自处理开发
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
9edfa3d481
安灯知识库
6 years ago
97763d6b53
安灯广播， 安灯管理显示不同界面， 添加操作来源字段
6 years ago
ce187f9720
安灯广播
6 years ago
dc3fd624f2
Merge branch 'dev' into test
6 years ago
c39462cd35
安灯广播
6 years ago
40321ed7ec
Merge branch 'test'
6 years ago
4e2373bdae
Merge branch 'dev' into test
6 years ago
db26628d9f
安灯广播
6 years ago
钮海涛
wynne1005
王杰
wei.peng
汪云昊
贾文涛
曾贞一
luweihao
crish
jenkins
许心洁
刘辉
jokelone