YUJT
|
1ca4683a29
|
Merge branch 'feature/dev_sunjiatan_moveout'
|
3 years ago |
jianjun
|
d99854e712
|
Merge remote-tracking branch 'remotes/origin/dev_5big_coverage'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
jianjun
|
9961f16461
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
1c7b7ecad5
|
bug
|
3 years ago |
zhaoqifeng
|
36cac46679
|
迁出逻辑修改
|
3 years ago |
|
jianjun
|
d6c8159347
|
bug
|
3 years ago |
|
jianjun
|
87a46ea9c3
|
bug
|
3 years ago |
|
jianjun
|
60e0cc73eb
|
bug
|
3 years ago |
wangxianzhang
|
cba5be0cb1
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
ad3d556678
|
【居民信息导入】修复:兼容cascader空间的bug
|
3 years ago |
|
jianjun
|
ff34a61581
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
YUJT
|
6f64dc05a0
|
Merge branch 'feature/dev_sunjiatan_moveout'
|
3 years ago |
|
YUJT
|
13e0c5ae1d
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
zhaoqifeng
|
028d568c87
|
驳回原因不能为空
(cherry picked from commit e95168c269)
|
3 years ago |
|
jianjun
|
3306411c39
|
一个人多个角色 bug 导致的问题
|
3 years ago |
yinzuomei
|
a27c7d40a8
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
yinzuomei
|
8f7df98a28
|
手机号50字
|
3 years ago |
|
wangxianzhang
|
837e320c0f
|
【五大图层】企事业单位巡查列表修改，不展示巡查记录列表，展示企业列表
|
3 years ago |
sunyuchao
|
95042fa83d
|
导出方法设置表头底色
|
3 years ago |
|
yinzuomei
|
80fe97ff51
|
固定住
|
3 years ago |
HAHA
|
b1baf21826
|
通过tokenDto获取userId
|
3 years ago |
|
wangxianzhang
|
c95cadf150
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
cf6c6e47a3
|
修改scan服务local,dev,test的日志级别
|
3 years ago |
|
jianjun
|
1b79dbecde
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
wangxianzhang
|
e3c0912140
|
【五大图层】经纬度反了。。
|
3 years ago |
|
wangxianzhang
|
64420ea040
|
【五大图层】居民相关的查询，获取不到楼栋坐标，就是用跟组织坐标
|
3 years ago |
|
jianjun
|
0ee562cf75
|
bug
|
3 years ago |
|
jianjun
|
68d93b3548
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
b76ebe18f5
|
bug
|
3 years ago |
|
zhaoqifeng
|
06c361af31
|
家庭成员移除
|
3 years ago |
|
zhaoqifeng
|
a1f47fb4dc
|
家庭成员移除
|
3 years ago |
|
zhaoqifeng
|
cdf2554d12
|
家庭成员移除
|
3 years ago |
|
yinzuomei
|
3fb06e2156
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
ea5f8942d6
|
bugfix
|
3 years ago |
|
jianjun
|
85c399e974
|
Merge remote-tracking branch 'remotes/origin/dev_icresiuser_pids'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
zhaoqifeng
|
f60ddbee1d
|
家庭成员移除
|
3 years ago |
|
jianjun
|
273d5b1df7
|
更新房屋内居民数据
|
3 years ago |
|
jianjun
|
7ef08e2a73
|
更新房屋内居民数据
|
3 years ago |
|
jianjun
|
89df790fd2
|
更新房屋内数据
|
3 years ago |
|
wangxianzhang
|
f11fddc5b2
|
/resi-brief接口中对志愿者的查询，查不到字典不再抛出异常，而是打印error日志
|
3 years ago |
Jackwang
|
0b83c27187
|
工作端/居民端-新增家庭成员添加变动记录
|
3 years ago |
|
sunyuchao
|
a0788727c8
|
只有经纬度取根组织的其他信息不变
|
3 years ago |
zxc
|
c1967b360b
|
emm
|
3 years ago |
|
jianjun
|
b61c8e7690
|
1
|
3 years ago |
|
jianjun
|
67b11d7d89
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_5big_coverage
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
zhangyuan
|
eaf642a7ab
|
各类人员关联时加上客户ID
|
3 years ago |
|
jianjun
|
799ed4627b
|
1
|
3 years ago |
|
jianjun
|
48b93f729b
|
防重复提交 token为空则直接跳过
|
3 years ago |
|
yinzuomei
|
9a6f304952
|
jign经度纬度
|
3 years ago |
|
zxc
|
f600955f76
|
社区自组织防重复提交去除
|
3 years ago |
