 钮海涛
|
94e9b2ffec
|
Merge remote-tracking branch 'remotes/origin/master' into test
|
6 years ago |
 王杰
|
029763feb1
|
pom
|
6 years ago |
|
王杰
|
30fcf4f23f
|
pom冲突
|
6 years ago |
|
王杰
|
716e1f7df1
|
Merge branch 'test' into dev
|
6 years ago |
wei.peng
|
c288b54660
|
查询优化
|
6 years ago |
汪云昊
|
717f268c28
|
POJO版本号还原
|
6 years ago |
|
汪云昊
|
8fe0244a20
|
POJO添加序列化id
|
6 years ago |
|
汪云昊
|
9532489502
|
POJO添加序列化id
|
6 years ago |
|
wei.peng
|
3669fbb4a4
|
本地版本库雪崩,有问题请排查此版本
|
6 years ago |
|
王杰
|
a6e9b90026
|
pom
|
6 years ago |
|
王杰
|
de9017ca5c
|
冲突
|
6 years ago |
|
王杰
|
eaecf4b4b7
|
pom
|
6 years ago |
|
王杰
|
7d192b36a6
|
pom冲突
|
6 years ago |
|
钮海涛
|
005d0f7f86
|
修复合并问题
|
6 years ago |
|
钮海涛
|
bc269e1f71
|
Merge branch 'master' into test
|
6 years ago |
wynne1005
|
27e4fb164b
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
32460a3272
|
sqlserver 适配处理，in 参数类型不准确
|
6 years ago |
|
汪云昊
|
2ab9045d17
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
30c0b2e46a
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
d4a91b6d69
|
缺失资源接口优化
|
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 |
|
钮海涛
|
c6d36af4c9
|
Merge branch 'master' into test
|
6 years ago |
|
wei.peng
|
3aa1afb0ce
|
对象历史记录 Pojo 创建
|
6 years ago |
|
wei.peng
|
c8197f3290
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
6 years ago |
|
wei.peng
|
9d3a4db040
|
日志查询Bug 修复
|
6 years ago |
|
wei.peng
|
fee90baf64
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
6 years ago |
|
wei.peng
|
effae233bf
|
对象历史记录 Pojo 创建
|
6 years ago |
|
wei.peng
|
fe46d8da29
|
1. 授权封装位置调整
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
|
6 years ago |
|
wei.peng
|
69346da06d
|
日志查询Bug 修复
|
6 years ago |
|
wei.peng
|
dac1358009
|
1. 关闭register , gateway , console 日志持久化技术
2. Sonar Bug 修复
3. 自定义日志持久化
|
6 years ago |
|
wynne1005
|
d6fe718e4c
|
Merge branch 'dev' into test
|
6 years ago |
|
汪云昊
|
edf0b66115
|
Sonar代码缺陷修复
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
|
6 years ago |
|
钮海涛
|
efe083a9da
|
修复版本号
|
6 years ago |
|
钮海涛
|
288fb4a16b
|
修改POM版本号
|
6 years ago |
|
钮海涛
|
aff68cd087
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
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 |
|
汪云昊
|
e7d176209e
|
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
64d83d238f
|
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
3fd17208e2
|
枚举更新
|
6 years ago |
|
钮海涛
|
1d16e2d938
|
解决合并冲突
|
6 years ago |
 贾文涛
|
492dfbff82
|
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
|
6 years ago |
|
wei.peng
|
1d00303306
|
自定义报表-折线图,饼图,柱状图,矩形图 完成
|
6 years ago |
|
汪云昊
|
aeda8d8287
|
版本调整
|
6 years ago |
|
汪云昊
|
3069c5bf18
|
查询条件补充
|
6 years ago |
|
汪云昊
|
ec1d52e7dd
|
MAVEN 版本控制调整
|
6 years ago |
|
贾文涛
|
7106c06221
|
统一修改pom文件的项目版本问题0331
|
6 years ago |
|
wynne1005
|
44696061ee
|
修改pom文件为最新
|
6 years ago |
|
wynne1005
|
3c08e7794f
|
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
b8abed43ca
|
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
|
6 years ago |
|
汪云昊
|
a32d4b3b00
|
资源模块化
资源工具类优化
|
6 years ago |
|
wynne1005
|
d80b341620
|
还原test pom
|
6 years ago |
|
贾文涛
|
048419d823
|
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
|
6 years ago |
 曾贞一
|
779b9d209c
|
【修改 DEV-pom.xml】
|
6 years ago |
luweihao
|
12579c7a14
|
还原pom
|
6 years ago |
|
wei.peng
|
262edb9fec
|
日志查询优化, Es Tool 添加 聚合函数
|
6 years ago |
|
wei.peng
|
d7c9647ca5
|
表格查询功能完成
|
6 years ago |
|
汪云昊
|
f7d6192794
|
资源唯一校验调整为key+languageCode+softType
|
6 years ago |
|
汪云昊
|
0bd38e8e9a
|
打印模板查询优化
|
6 years ago |
|
wei.peng
|
f768247c4f
|
代码合并 2019-12-30 15:59:52
|
6 years ago |
|
wei.peng
|
3b7b374b23
|
自定报表对象模型调整
|
6 years ago |
|
汪云昊
|
d5c1f7a7a3
|
资源模块数据
模板软删除
软适配list传参
|
6 years ago |
|
汪云昊
|
14f1ced301
|
会话文件展示地址封装
|
6 years ago |
|
汪云昊
|
3dd247491a
|
软件适配器异常信息优化
|
6 years ago |
|
汪云昊
|
3902fb6309
|
资源增量导入优化
|
6 years ago |
|
汪云昊
|
47fb080742
|
lac线程超时监控优化
Session超时时间参数化
lac添加TaskCheck
日志添加索引
|
6 years ago |
|
汪云昊
|
8c872302a3
|
细节调整
|
6 years ago |
|
王杰
|
cfa54aa2b6
|
修改pom
|
6 years ago |
|
汪云昊
|
f5a0f24355
|
Merge remote-tracking branch 'remotes/origin/dev' into test
|
6 years ago |
|
汪云昊
|
ad0389fb13
|
JOB日志优化
|
6 years ago |
|
汪云昊
|
3faa679cf9
|
Job测试
新增资源初始化方式（导入，导出）
异常日志持久化bug
OPC服务
MQ管理接口
|
6 years ago |
|
王杰
|
1d920627ec
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
7893bcd77e
|
功能菜单国际化 完成
|
6 years ago |
crish
|
4d3adf5daf
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
6cb9eeed8c
|
功能权限 倒入导出 添加产品类型校验
|
6 years ago |
|
wei.peng
|
11bc240347
|
功能权限国际完成
|
6 years ago |
|
王杰
|
ac5432bebb
|
解决冲突
|
6 years ago |
|
王杰
|
64d631c180
|
Merge branch 'test'
|
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 |
|
crish
|
410558d43c
|
Merge branch 'test'
|
6 years ago |
|
jenkins
|
b5685a7874
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
wei.peng
|
0e1220c329
|
Core 服务 用户查询优化
|
6 years ago |
|
jenkins
|
3d8421e1ec
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
423d8d2c03
|
日志开关
lac优化
OPC UA工具类
|
6 years ago |
许心洁
|
c79786a677
|
合并开发分支的代码POM文件被改成DEV修改回TEST
|
6 years ago |
|
crish
|
0526da8ee3
|
Merge branch 'test'
|
6 years ago |
|
crish
|
cd74f5336f
|
Merge branch 'dev' into test
|
6 years ago |
|
wei.peng
|
689f6057c1
|
添加查询账号接口
|
6 years ago |
|
crish
|
1de89d732b
|
本地误拉了test代码，解决pom
|
6 years ago |
|
crish
|
9f9874902d
|
冲突解决
|
6 years ago |
|
crish
|
0924810e64
|
Merge branch 'test'
|
6 years ago |
刘辉
|
60d1798b9c
|
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
|
6 years ago |
|
汪云昊
|
de685a0627
|
删除pojo数据默认值
|
6 years ago |
|
汪云昊
|
bd55a18bf6
|
微服务接口 - 打印模板分页查询
|
6 years ago |
|
曾贞一
|
6c8cfd8678
|
Merge remote-tracking branch 'remotes/origin/test'
|
6 years ago |
|
曾贞一
|
a4262c5e1e
|
pom文件修改 dev改成test
|
6 years ago |
|
crish
|
b473fd1b46
|
pojo开发环境 pom文件修改为dev
|
6 years ago |
|
crish
|
87f8dc38a6
|
测试环境
|
6 years ago |