 王杰
|
a595fed4fe
|
Merge branch 'test'
|
6 years ago |
jenkins
|
4be5d5e1aa
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
wei.peng
|
8f07751100
|
LAC 日志记录查询完成
|
6 years ago |
|
王杰
|
64d631c180
|
Merge branch 'test'
|
6 years ago |
汪云昊
|
f95482501b
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
efea8980e7
|
解除冲突
|
6 years ago |
|
汪云昊
|
5a2a2a5e8d
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
Conflicts:
modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java
|
6 years ago |
|
jenkins
|
092f72872b
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
4b17995206
|
LAC 日志记录Cache 完成
|
6 years ago |
|
汪云昊
|
b4976be85e
|
LAC执行流程调试
UA订阅次数问题
|
6 years ago |
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
汪云昊
|
7cb9ffd37b
|
Lac细节优化
OPC调整
|
6 years ago |
|
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
aab18be0e6
|
Lac细节优化
OPC调整
|
6 years ago |
|
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
|
汪云昊
|
053b3ae0e4
|
LAC 前端联调调整
|
6 years ago |
|
crish
|
c4d7a2380c
|
Merge branch 'test'
|
6 years ago |
许心洁
|
9755e5f751
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
da7ba77dab
|
LAC 跨服务调用软适配接口完成
|
6 years ago |
|
王杰
|
d2c7a81893
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
23f0503454
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
wei.peng
|
0ba20f0094
|
LAC 日志查询接口功能完成
|
6 years ago |
陆卫豪
|
07a80e7fd2
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
0d777d1894
|
LAC 日志处理功能完成
|
6 years ago |
|
wei.peng
|
b963bcb502
|
LAC 日志处理功能完成
|
6 years ago |
|
汪云昊
|
154bba4b3b
|
LAC 调度模式优化
|
6 years ago |
|
王杰
|
2417b40635
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
cfd7f5276e
|
实体调整
|
6 years ago |
|
许心洁
|
9c54b2561c
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
50bf9300ba
|
LAC 调度模式完成
|
6 years ago |
|
王杰
|
7291a7a85c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
4b66ec0e87
|
任务实例id
|
6 years ago |
|
汪云昊
|
9907813aed
|
Lac调度实体
|
6 years ago |
|
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
wei.peng
|
7496eb4a1b
|
LAC 全部 CRUD 接口完成
|
6 years ago |
|
crish
|
18161e8191
|
Merge branch 'test'
|
6 years ago |
|
许心洁
|
0c20a2b655
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
4c6f0b0d57
|
添加 CRUD Base
|
6 years ago |
|
许心洁
|
f5a8e9f130
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
d5a45176d0
|
LAC 任务类型、指令集类型 对象优化
|
6 years ago |
|
许心洁
|
d5864ba490
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
e8f8c941c9
|
LAC 指令集类型CRUD接口完成
LAC 任务类型CRUD接口完成
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
 曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |
|
crish
|
d82e025eb9
|
dev环境pom文件修改为dev
|
6 years ago |
jimmy.zeng
|
c901f18f89
|
pom版本还原
|
6 years ago |
WYnneaoapc
|
5e72d98ad8
|
提交
|
6 years ago |
|
曾贞一
|
8b457c0618
|
DEV 合并 TEST pom.xml文件修改
|
6 years ago |
于学杰
|
e7913cfb26
|
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
|
6 years ago |
|
yunhao.wang
|
6ebc22e6cc
|
master分支配置调整
|
6 years ago |
wei.peng
|
521f474753
|
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test
# Conflicts:
# modules/i3plus-block-form/src/main/resources/application-test.properties
# modules/i3plus-block-report/src/main/resources/application-test.properties
合并代码 发版修改配置 - Pw
2019-5-8 20:53:28
|
6 years ago |
alwaysfrin
|
f343ea865c
|
安灯和硬件适配初始化
|
6 years ago |