I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,735 Commits
1 Branch
0 Tags
20 MiB
yun-zuoyi
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ebbb1b9f34'
${ noResults }
Commit Graph

671 Commits (ebbb1b9f348d11fb0c56985c173ef91255f8b0f0)

Author SHA1 Message Date
钮海涛 7afd60073a Merge remote-tracking branch 'remotes/origin/test' 5 years ago
汪云昊 5d7397aa4e Merge remote-tracking branch 'origin/dev' into test 5 years ago
汪云昊 ee3f9415a7 fix(core):组织，部门代码无唯一校验 5 years ago
汪云昊 171f39cf01 revert:还原pojo pom.xml报表 5 years ago
钮海涛 543058b3a5 合并sweb代码 5 years ago
钮海涛 5c104e036f 合并test代码 5 years ago
汪云昊 163d0773a9 修改pom文件版本 5 years ago
汪云昊 55a8bcad72 feat(core):系统更新记录功能 5 years ago
汪云昊 130d3a9792 feat:字典规则调整允许值为空 5 years ago
汪云昊 ab608c0919 feat:用户导出 5 years ago
汪云昊 5fbd0fdd80 fix:单号生成记录 5 years ago
汪云昊 cf2bf8d291 企业微信适配 5 years ago
汪云昊 b2517a11b8 feat(用户登录日志):用户登录日志查询及导出功能 5 years ago
钮海涛 e6b472bcfd 合并test代码到dev 5 years ago
钮海涛 92f0158dab 合并master代码 5 years ago
钮海涛 310da99743 合并master代码 5 years ago
汪云昊 8d6b01c06e Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 a52646a65d Merge remote-tracking branch 'remotes/origin/dev' into test 
# Conflicts:
#	modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java
 5 years ago
汪云昊 dd75e3729b feat:添加条码解析校验模式 5 years ago
汪云昊 26cf4c5e92 feat:mongo模块化 5 years ago
汪云昊 a5d7ff1ef4 feat:添加条码解析校验模式 5 years ago
钮海涛 9878547daa 合并dev分支代码 5 years ago
汪云昊 15aa885cf8 fix:定时任务空指针的问题 5 years ago
汪云昊 bda160ccec Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 8d17cfcec0 feat:用户定制化配置功能 5 years ago
钮海涛 39f6819e9b 修复合并版本问题 5 years ago
钮海涛 f760b72094 Merge remote-tracking branch 'remotes/origin/test' 5 years ago
汪云昊 e6ecd4f86f Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 5a6a7a77fc 平台功能优化，移除通用缓存服务 5 years ago
王杰 6c5e646d49 test merge master 5 years ago
贾文涛 c10a7bae7e 增加方法代码字段 5 years ago
汪云昊 1aa63db4d3 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 4b3470b1fd 定时任务日志优化 
邮件发送失败记录
 5 years ago
钮海涛 e140910db7 Merge remote-tracking branch 'origin/test' into test 5 years ago
汪云昊 c230c57c97 定时任务 导入导出 
定时任务 重载功能
 5 years ago
王杰 b3999ad481 dev merge test 5 years ago
王杰 767c1bffbc test merge dev 5 years ago
钮海涛 9a516f893f 合并dev代码到test 5 years ago
汪云昊 0fa8981440 定时任务日志bug修改及优化 
资源内存清理方法
 5 years ago
汪云昊 a2f7642d53 Merge remote-tracking branch 'origin/dev' into dev 5 years ago
汪云昊 cbf1c97c06 彭伟代码恢复 
定时任务日志过滤器
 5 years ago
wynne1005 bcb4e5ad13 merge test 5 years ago
wynne1005 31b5f3e234 merge dev 还原pom 5 years ago
wynne1005 b18408b3bb merge test 5 years ago
汪云昊 0c0eea561d 功能优化 5 years ago
wei.peng ec3febfaa9 Merge remote-tracking branch 'remotes/origin/dev' into test 5 years ago
汪云昊 0ea80a0f63 删除无用代码 
测试环境开关回滚
 5 years ago
wei.peng 4208d39e3f feat(密码规则验证完成): 用户登录,密码修改 5 years ago
wei.peng bdb5e6e27c 密码策略完成 5 years ago
wynne1005 b0b07437d6 还原pom 5 years ago
汪云昊 2888e5b510 错误注解 5 years ago
汪云昊 4de301bf79 MDM 系统结构优化 
单元测试开关
 5 years ago
wynne1005 60c1f6ecab 还原pom 5 years ago
wynne1005 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
wei.peng adb95f100f Ics 日志收集功能完成 5 years ago
钮海涛 6061f89d43 修复合并版本问题 5 years ago
wynne1005 b43317c11a 还原pom 5 years ago
wynne1005 4150543cb4 Effort Task #1940 Cost:16h Left:8h 5 years ago
wynne1005 8955fd2f4d mes提测 还原pom 5 years ago
wynne1005 23754d3f18 mes提测 还原pom 5 years ago
钮海涛 999a415d27 修复版本问题 5 years ago
钮海涛 b303cf9a14 修复合并问题 5 years ago
wynne1005 99d3c9d721 提测合并 还原pom 5 years ago
wynne1005 5ef88c80c0 提测合并 还原pom 5 years ago
wei.peng 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
wei.peng 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
wei.peng c288b54660 查询优化 5 years ago
汪云昊 717f268c28 POJO版本号还原 5 years ago
汪云昊 8fe0244a20 POJO添加序列化id 5 years ago
汪云昊 9532489502 POJO添加序列化id 5 years ago
wei.peng 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
wynne1005 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
wei.peng 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
wei.peng 3aa1afb0ce 对象历史记录 Pojo 创建 5 years ago
wei.peng c8197f3290 1. 授权封装位置调整 
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
 5 years ago
wei.peng 9d3a4db040 日志查询Bug 修复 5 years ago
wei.peng fee90baf64 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 5 years ago
wei.peng effae233bf 对象历史记录 Pojo 创建 5 years ago
wei.peng fe46d8da29 1. 授权封装位置调整 
2. 日志控制台查询封装
3. 添加软适配 同步接口调用
4. pom.xml 引用错误修复
 5 years ago
wei.peng 69346da06d 日志查询Bug 修复 5 years ago
wei.peng dac1358009 1. 关闭register , gateway , console 日志持久化技术 
2. Sonar Bug 修复
3. 自定义日志持久化
 5 years ago
wynne1005 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
wei.peng 1d00303306 自定义报表-折线图,饼图,柱状图,矩形图 完成 5 years ago
汪云昊 aeda8d8287 版本调整 5 years ago
汪云昊 3069c5bf18 查询条件补充 5 years ago
汪云昊 ec1d52e7dd MAVEN 版本控制调整 5 years ago
贾文涛 7106c06221 统一修改pom文件的项目版本问题0331 5 years ago
wynne1005 44696061ee 修改pom文件为最新 5 years ago
wynne1005 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
wynne1005 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
luweihao 12579c7a14 还原pom 5 years ago
wei.peng 262edb9fec 日志查询优化, Es Tool 添加 聚合函数 5 years ago
wei.peng d7c9647ca5 表格查询功能完成 5 years ago
汪云昊 f7d6192794 资源唯一校验调整为key+languageCode+softType 5 years ago
汪云昊 0bd38e8e9a 打印模板查询优化 5 years ago
wei.peng f768247c4f 代码合并 2019-12-30 15:59:52 5 years ago
wei.peng 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
wei.peng 7893bcd77e 功能菜单国际化 完成 6 years ago