钮海涛
b57ae573ed
合并test代码
5 years ago
汪云昊
7a6137a667
Merge remote-tracking branch 'origin/dev' into test
5 years ago
汪云昊
26e1b39119
feat(core):邮件支持附件发送
5 years ago
钮海涛
a8cdba48c3
合并Master代码
5 years ago
钮海涛
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