2888e5b510
错误注解
5 years ago
4de301bf79
MDM 系统结构优化
...
单元测试开关
5 years ago
60c1f6ecab
还原pom
5 years ago
47ae0b46ef
还原pom
5 years ago
0067e31420
合并test分支代码到dev分支
5 years ago
钮海涛
7982cefc1e
Merge branch 'test' into dev
5 years ago
钮海涛
2f8b0ba5db
修复版本问题
5 years ago
钮海涛
a71d7a31ce
Merge branch 'master' into test
5 years ago
2f71b79ed8
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
2f01b41c1e
定时任务控制台日志
5 years ago
7aaa8bca6d
合并dev分支代码到test分支
5 years ago
adb95f100f
Ics 日志收集功能完成
5 years ago
钮海涛
6061f89d43
修复合并版本问题
5 years ago
b43317c11a
还原pom
5 years ago
4150543cb4
Effort Task #1940 Cost:16h Left:8h
5 years ago
8955fd2f4d
mes提测 还原pom
5 years ago
23754d3f18
mes提测 还原pom
5 years ago
钮海涛
999a415d27
修复版本问题
5 years ago
钮海涛
b303cf9a14
修复合并问题
5 years ago
99d3c9d721
提测合并 还原pom
5 years ago
5ef88c80c0
提测合并 还原pom
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
9ee8acae91
合并代码 有代码丢失或者文件丢失请排查此处
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
王杰
30fcf4f23f
pom冲突
5 years ago
王杰
716e1f7df1
Merge branch 'test' into dev
5 years ago
c288b54660
查询优化
5 years ago
717f268c28
POJO版本号还原
5 years ago
8fe0244a20
POJO添加序列化id
5 years ago
9532489502
POJO添加序列化id
5 years ago
3669fbb4a4
本地版本库雪崩,有问题请排查此版本
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
钮海涛
bc269e1f71
Merge branch 'master' into test
5 years ago
27e4fb164b
Merge branch 'dev' into test
5 years ago
32460a3272
sqlserver 适配处理，in 参数类型不准确
5 years ago
2ab9045d17
Merge remote-tracking branch 'remotes/origin/dev' into test
5 years ago
30c0b2e46a
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
d4a91b6d69
缺失资源接口优化
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
钮海涛
c6d36af4c9
Merge branch 'master' into test
5 years ago
3aa1afb0ce
对象历史记录 Pojo 创建
5 years ago
c8197f3290
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
5 years ago
9d3a4db040
日志查询Bug 修复
5 years ago
fee90baf64
1. 关闭register , gateway , console 日志持久化技术
...
2. Sonar Bug 修复
3. 自定义日志持久化
5 years ago
effae233bf
对象历史记录 Pojo 创建
5 years ago
fe46d8da29
1. 授权封装位置调整
...
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
5 years ago
69346da06d
日志查询Bug 修复
5 years ago
dac1358009
1. 关闭register , gateway , console 日志持久化技术
...
2. Sonar Bug 修复
3. 自定义日志持久化
5 years ago
d6fe718e4c
Merge branch 'dev' into test
5 years ago
edf0b66115
Sonar代码缺陷修复
...
查询条件优化
拦截器，自定义按钮对外接口实现
表单-功能目录优化
软适配日志优化
5 years ago
钮海涛
efe083a9da
修复版本号
5 years ago
钮海涛
288fb4a16b
修改POM版本号
5 years ago
钮海涛
aff68cd087
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
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
e7d176209e
Merge branch 'dev' of yunhao.wang/i3plus-pojo into dev
5 years ago
64d83d238f
Merge branch 'dev' of wei.peng/i3plus-pojo into dev
5 years ago
3fd17208e2
枚举更新
5 years ago
钮海涛
1d16e2d938
解决合并冲突
5 years ago
贾文涛
492dfbff82
pom通过变量方式存在只能引用jar不能引用到项目文件的问题，暂时先还原为最初方式
5 years ago
1d00303306
自定义报表-折线图,饼图,柱状图,矩形图 完成
5 years ago
aeda8d8287
版本调整
5 years ago
3069c5bf18
查询条件补充
5 years ago
ec1d52e7dd
MAVEN 版本控制调整
5 years ago
贾文涛
7106c06221
统一修改pom文件的项目版本问题0331
5 years ago
44696061ee
修改pom文件为最新
5 years ago
3c08e7794f
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
5 years ago
b8abed43ca
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
5 years ago
a32d4b3b00
资源模块化
...
资源工具类优化
5 years ago
d80b341620
还原test pom
5 years ago
贾文涛
048419d823
修改打包时版本号的定义，后续可以通过mvn clean install Pdev 命令进行打包,最后dev还可以更换为test、prod、docker。
5 years ago
曾贞一
779b9d209c
【修改 DEV-pom.xml】
5 years ago
12579c7a14
还原pom
5 years ago
262edb9fec
日志查询优化, Es Tool 添加 聚合函数
5 years ago
d7c9647ca5
表格查询功能完成
5 years ago
f7d6192794
资源唯一校验调整为key+languageCode+softType
5 years ago
0bd38e8e9a
打印模板查询优化
5 years ago
f768247c4f
代码合并 2019-12-30 15:59:52
5 years ago
3b7b374b23
自定报表对象模型调整
5 years ago
d5c1f7a7a3
资源模块数据
...
模板软删除
软适配list传参
5 years ago
14f1ced301
会话文件展示地址封装
5 years ago
3dd247491a
软件适配器异常信息优化
5 years ago
3902fb6309
资源增量导入优化
5 years ago
47fb080742
lac线程超时监控优化
...
Session超时时间参数化
lac添加TaskCheck
日志添加索引
5 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
7893bcd77e
功能菜单国际化 完成
6 years ago
4d3adf5daf
Merge branch 'dev' into test
6 years ago
6cb9eeed8c
功能权限 倒入导出 添加产品类型校验
6 years ago
11bc240347
功能权限国际完成
6 years ago
王杰
ac5432bebb
解决冲突
6 years ago
王杰
64d631c180
Merge branch 'test'
6 years ago
092f72872b
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
4b17995206
LAC 日志记录Cache 完成
6 years ago
410558d43c
Merge branch 'test'
6 years ago
b5685a7874
Merge branch 'dev' of i3-IMPP/i3plus-pojo into test
6 years ago
0e1220c329
Core 服务 用户查询优化
6 years ago
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
0526da8ee3
Merge branch 'test'
6 years ago
cd74f5336f
Merge branch 'dev' into test
6 years ago
689f6057c1
添加查询账号接口
6 years ago
1de89d732b
本地误拉了test代码，解决pom
6 years ago
9f9874902d
冲突解决
6 years ago
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
b473fd1b46
pojo开发环境 pom文件修改为dev
6 years ago
87f8dc38a6
测试环境
6 years ago
d82e025eb9
dev环境pom文件修改为dev
6 years ago
8f58627838
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
1e01f62188
Bug 修复
6 years ago
4bfa05698f
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
6cbcea7c2c
系统菜单默认排序值改动
6 years ago
bbfc9b320f
Merge branch 'test'
6 years ago
04f8aaa783
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
eadb86ce60
excel通用导入优化
6 years ago
曾贞一
ae12af551b
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
96a29d3de8
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
90bb35c83f
用户默认分页配置功能开发
...
用户获取首页插件Bug 修复
6 years ago
b34be0b86e
Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
2ef0dd5c3b
周期修改关联数据
6 years ago
曾贞一
25e7ca08d3
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
7e5d2e1e56
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
cf026d6dee
获取模板详情列表功能接口开发完成
6 years ago
1f1a9c39fc
异常国际化功能开发完成
6 years ago
f7b366fe29
Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
12a2a27b18
mes， pcn条码打印
...
Signed-off-by: crish <570360737@qq.com>
6 years ago
曾贞一
18aff86ea0
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
856c77a965
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
c901f18f89
pom版本还原
6 years ago
0bc9f2e9bc
获取模板 微服务调用重新编写
6 years ago
曾贞一
b10b967b73
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
5e72d98ad8
提交
6 years ago
4ff3677fba
Merge branch 'test' into dev
6 years ago
a2a4dc6beb
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
7eed51791f
软件适配器-定时适配任务
6 years ago
b9d9d7402e
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
b0d2812778
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
409c433b5c
添加字典分组
6 years ago
曾贞一
fbe8544a02
Merge remote-tracking branch 'remotes/origin/test'
6 years ago
aee54acafc
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
68e4b74e0a
平台权限系功能优化
6 years ago
c986f7b2a3
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
9ee2901346
添加字典分组
...
优化redis资源键
6 years ago
曾贞一
47d4a53706
Merge branch 'dev'
...
# Conflicts:
# modules/i3plus-pojo-andon/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-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
曾贞一
8b457c0618
DEV 合并 TEST pom.xml文件修改
6 years ago
e7913cfb26
1. 从 TEST 合并代码后 POM 文件中引用的版本不正确，修改为 DEV
6 years ago
837d6ea567
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
5a6cd405b6
用户管理修改密码 Bug 修复
6 years ago
19871c5f27
Merge branch 'test'
6 years ago
8f977719c0
Merge branch 'dev' into test
6 years ago
ce7095932c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
47238f131b
Merge branch 'test'
6 years ago
8daa2789a4
Merge branch 'dev' into test
6 years ago
7181e85ba5
安灯导出实体注解
...
定时任务日志添加字段
6 years ago
00fc0de4a9
冲突
6 years ago
742e0a6f49
冲突
6 years ago
6598a829e0
Merge branch 'dev'
6 years ago
98041fe58d
流程管家优化
6 years ago
812be94ed3
Merge branch 'dev' into test
6 years ago
fb743ebafc
登录会话添加设备ID
...
自定义表单添加数据表唯一教研
自定义表单添加映射类型
6 years ago
90048c3f0a
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
934da4419f
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
4f553c0857
添加序列化ID , 用户登录在线机制完成
6 years ago
ad09180809
Merge branch 'dev' into test
6 years ago
9ab2165086
Merge branch 'dev' into test
6 years ago
67c70189b3
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
8461e12248
用户获取菜单信息调整
6 years ago
0526fcf05c
Merge branch 'dev' into test
6 years ago
19afeb92b7
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
6 years ago
2a587524ff
基础操作,数据补全
6 years ago
0ed90485a6
安灯基础数据导入导出
6 years ago
353b8a37c5
Merge branches 'master' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo
6 years ago
6c57b8e10c
Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
6 years ago
2aa2dca77f
用户权限调整
6 years ago
e1824dbba4
Merge remote-tracking branch 'remotes/origin/dev' into test
6 years ago
be78ed2636
用户权限调整 帐号管理权限完成
6 years ago
c858475bd2
用户权限调整 部门权限调整完成
6 years ago
24f7ae3471
Merge branch 'test'
6 years ago
3a19888ddf
用户权限调整 岗位功能调整完成
6 years ago
53d34096f7
Merge branch 'dev' into test
6 years ago
8e39e6d9fb
Merge remote-tracking branch 'origin/dev' into dev
6 years ago
汪云昊
wynne1005
袁津哲
钮海涛
wei.peng
王杰
贾文涛
曾贞一
luweihao
crish
jenkins
许心洁
刘辉
jimmy.zeng
于学杰
peter.pan
jenkins