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
|
294f3ab436
|
Merge branch 'develop' into release_temp
|
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 |
wangxianzhang
|
7288471559
|
Merge branch 'dev_ic_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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 |
|
yinzuomei
|
ca69e84f8f
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
711a4501e3
|
搜索条件key修改。
|
4 years ago |
|
yinzuomei
|
220b6f744a
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
dde6df3f22
|
搜索条件key修改。
|
4 years ago |
|
jianjun
|
faabfa043f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_ic_v2
|
4 years ago |
|
sunyuchao
|
899ead2f35
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
sunyuchao
|
de58e12a92
|
Merge branch 'dev_ic_v2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_v2
|
4 years ago |
|
sunyuchao
|
af23c1a534
|
bug修改
|
4 years ago |
|
sunyuchao
|
334814e658
|
增加字典表value对应label返参
|
4 years ago |
|
yinzuomei
|
e5c4e76d85
|
Merge remote-tracking branch 'origin/dev_ic_v2' into develop
|
4 years ago |
|
yinzuomei
|
7f05e224f4
|
完成id
|
4 years ago |
|
sunyuchao
|
29e6feb83c
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
sunyuchao
|
507ffbad6d
|
导出改为post
|
4 years ago |
|
jianjun
|
5fbf879f74
|
cuowu up
|
4 years ago |
|
jianjun
|
eb7c3bf901
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
bfcfd8298e
|
cuowu
|
4 years ago |
|
jianjun
|
77ad80eec4
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
fa3b69e9aa
|
cuowu
|
4 years ago |
|
sunyuchao
|
60430197b0
|
Merge branch 'dev_ic_v2' into develop
|
4 years ago |
|
sunyuchao
|
0fa85a975c
|
日期入参类型调整
|
4 years ago |
