jianjun
|
e7793b9c8a
|
改个名
|
4 years ago |
|
jianjun
|
9f96982dea
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_platform
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
|
4 years ago |
|
jianjun
|
ea5aaa860c
|
添加新的异常类
|
4 years ago |
zhaoqifeng
|
8082a69ef5
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zhaoqifeng
|
79433b1238
|
程序修改
|
4 years ago |
zxc
|
c86bc357e1
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
db9118cba4
|
加字段
|
4 years ago |
|
zhaoqifeng
|
5ac2deab11
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zhaoqifeng
|
bfa9bc3689
|
程序修改
|
4 years ago |
|
zhaoqifeng
|
74f5984564
|
程序修改
|
4 years ago |
|
zhaoqifeng
|
8c750a2728
|
程序修改
|
4 years ago |
sunyuchao
|
cba02c2c62
|
二二三四
|
4 years ago |
|
sunyuchao
|
a011405be6
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
sunyuchao
|
5885b2c7bc
|
修改错误码提示
|
4 years ago |
|
sunyuchao
|
381aa8d057
|
Merge branch 'dev_ic_platform' into develop
|
4 years ago |
|
sunyuchao
|
84705fadcb
|
增加一个错误码
|
4 years ago |
|
zhaoqifeng
|
3fe1d719c3
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_grid_platform
|
4 years ago |
|
zxc
|
63071de568
|
放重复
|
4 years ago |
|
zhaoqifeng
|
fd6630f36d
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zhaoqifeng
|
c90bc0c426
|
防止重复提交
|
4 years ago |
|
jianjun
|
3b72447ff0
|
Merge remote-tracking branch 'remotes/origin/dev_ic_v2' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
jianjun
|
db79fbdee8
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
jianjun
|
d278e1fb88
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_v2
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
jianjun
|
2ff6be80a2
|
防重复
|
4 years ago |
|
zhaoqifeng
|
3ca85378c7
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zhaoqifeng
|
7f75a3d21c
|
agencyId从缓存获取
|
4 years ago |
|
sunyuchao
|
fbf39e3864
|
Merge branch 'dev_ic_platform' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
sunyuchao
|
db819d6bcc
|
新增需求：新增、修改居民信息，身份证号唯一
|
4 years ago |
wangxianzhang
|
397574629d
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
e4825dee6a
|
修改：
1.居民信息导入，增加本地缓存
|
4 years ago |
|
zhaoqifeng
|
e24e839de2
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zhaoqifeng
|
929bc54227
|
agencyId从缓存获取
|
4 years ago |
|
sunyuchao
|
0e0771e633
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
zxc
|
deed5a2ee9
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
zxc
|
e62829c4b6
|
导入
|
4 years ago |
|
sunyuchao
|
ad5f07fde5
|
社会组织导入
|
4 years ago |
|
jianjun
|
ab72e6e52f
|
git-flow-plus3
|
4 years ago |
|
jianjun
|
66e2b81813
|
git-flow-plus3
|
4 years ago |
|
jianjun
|
130b8664b8
|
git-flow-plus
|
4 years ago |
|
jianjun
|
2bd6f8c263
|
git-flow-plus
|
4 years ago |
yinzuomei
|
4caa123a3a
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
417cf42ecf
|
社会组织下拉框
|
4 years ago |
|
jianjun
|
6fcd4bd7ad
|
日志微调
|
4 years ago |
|
sunyuchao
|
73d4f5f0ac
|
社会组织导入初版
|
4 years ago |
|
yinzuomei
|
abdd9e45cc
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
03cee50707
|
分页查询
|
4 years ago |
|
yinzuomei
|
1775b1aa42
|
分页查询
|
4 years ago |
|
sunyuchao
|
5bd4187a17
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
sunyuchao
|
aefd07f346
|
Merge remote-tracking branch 'origin/dev_ic_v2' into dev_ic_v2
|
4 years ago |
|
sunyuchao
|
6e3cac3897
|
url大小写问题
|
4 years ago |
