 王杰
|
068a0956db
|
解决冲突
|
6 years ago |
WYnneaoapc
|
adb4bd2a1c
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
42a22d14d3
|
安灯导出字=字段冗余
|
6 years ago |
|
王杰
|
ab68895760
|
test分支修改pom
|
6 years ago |
|
王杰
|
c87b00756f
|
dev分支修改pom
|
6 years ago |
jenkins
|
350f7101d2
|
Jenkins自动合并
|
6 years ago |
|
王杰
|
7bc434ed15
|
安灯组装模型优化
|
6 years ago |
|
王杰
|
dfb23bab1d
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
bc61b43e8d
|
安灯人员统计报表工位代码不显示问题修复
|
6 years ago |
|
王杰
|
c4c615bd15
|
Merge branch 'dev' into test
|
6 years ago |
|
王杰
|
3ff9fbc140
|
安灯图表
|
6 years ago |
|
王杰
|
d62aec1c62
|
更新 'modules/i3plus-pojo-andon/pom.xml'
|
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 |
|
crish
|
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 |
|
crish
|
1a7fda268b
|
andon 系统配置
|
6 years ago |
|
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
|
crish
|
67461457fc
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
1e0f0c706c
|
安灯问题修复
|
6 years ago |
|
crish
|
4eaa8b5b17
|
导入导出
|
6 years ago |
|
crish
|
6902c79472
|
问题清单问题修复
|
6 years ago |
|
crish
|
7d8b8664cc
|
问题清单问题修复
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
crish
|
0824a58ead
|
安灯定时自处理job, 广播播报内容优化
|
6 years ago |
|
crish
|
15e812c7a6
|
Merge branch 'test'
|
6 years ago |
|
crish
|
7d20321be5
|
Merge branch 'dev' into test
|
6 years ago |
|
crish
|
901e37d6e7
|
修复bug
|
6 years ago |