yinzuomei
|
14d93e8fff
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
4 years ago |
|
yinzuomei
|
230b3fa476
|
变更记录返回原因变更时间，调整时间为createdTime
|
4 years ago |
zxc
|
8e98b079bd
|
导入房屋更新，变动记录新增
|
4 years ago |
|
yinzuomei
|
74d6630c73
|
注释
|
4 years ago |
|
yinzuomei
|
7b8cbddcba
|
sql脚本
|
4 years ago |
|
yinzuomei
|
40114561ed
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
4 years ago |
|
yinzuomei
|
5533e9a283
|
新增迁出/死亡内部方法内部插入调动./变更记录
|
4 years ago |
|
zxc
|
6a3b1748c6
|
房屋更新变动记录新增
|
4 years ago |
Jackwang
|
ebfaf8b808
|
添加补充状态
|
4 years ago |
jianjun
|
64e2f6e195
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_house_resi_export
|
4 years ago |
|
jianjun
|
f13582b5aa
|
导出一户一档 暂存
|
4 years ago |
|
yinzuomei
|
4a5cc131de
|
变更记录返参增加reason
|
4 years ago |
|
yinzuomei
|
80c1a06039
|
原来的变动，只有迁入到其他ic_resi_user.status='1'；subStatus='11';入参增加reason.
|
4 years ago |
|
yinzuomei
|
5776367a2a
|
IcResiUserSubStatusEnum，新增01，导入02
|
4 years ago |
|
yinzuomei
|
fa9c3e1747
|
SQL脚本
|
4 years ago |
sunyuchao
|
57e59417cb
|
迁入管理 代码生成
|
4 years ago |
|
zxc
|
84eae58ab0
|
字段修改
|
4 years ago |
|
Jackwang
|
743ab8e307
|
迁出、福利、死亡人员相关
|
4 years ago |
wangxianzhang
|
216fb26c86
|
居民信息模板变更。"居民基本信息录入表"sheet中的备注，挪动到了"基础信息"下
|
4 years ago |
|
zxc
|
cd09ae214a
|
Merge branch 'dev_resi_export' into dev
|
4 years ago |
|
zxc
|
b6e014f4a1
|
生成代码
|
4 years ago |
zhangyuan
|
ee144b1b4a
|
增加身份证获取年龄的功能
|
4 years ago |
|
zhangyuan
|
914414347c
|
福利等相关dto
|
4 years ago |
YUJT
|
db5dc52c25
|
新增居民端党员风采接口
|
4 years ago |
|
yinzuomei
|
8f844d27a4
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
4 years ago |
|
yinzuomei
|
1fec754035
|
注释一下
|
4 years ago |
|
zxc
|
188eff0e56
|
楼栋导入新增修改楼栋类型
|
4 years ago |
|
zxc
|
f49151d476
|
去除多余判断
|
4 years ago |
|
zhangyuan
|
4fabb54fb9
|
冗余代码
|
4 years ago |
|
zxc
|
601c85057c
|
sort default 0
|
4 years ago |
|
zxc
|
1366c8e0ac
|
小区导入bug修复
|
4 years ago |
|
zxc
|
75bd0eb8bb
|
房屋导入微调
|
4 years ago |
|
jianjun
|
6736ef1f1f
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
zhaoqifeng
|
86023faa67
|
个人信息
|
4 years ago |
|
jianjun
|
14cbe024d9
|
合并冲突解决
|
4 years ago |
|
jianjun
|
5a151ab746
|
Merge remote-tracking branch 'remotes/origin/back' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
4 years ago |
|
jianjun
|
e88a9f13f1
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
4 years ago |
|
yinzuomei
|
f9bbcb5605
|
修改房屋，删除房屋缓存
|
4 years ago |
|
zhaoqifeng
|
1459a2b36d
|
房屋管理左侧树排序
|
4 years ago |
|
zxc
|
3575b1f2f9
|
sort
|
4 years ago |
|
zhaoqifeng
|
f9d4b2c406
|
房屋管理左侧树排序
|
4 years ago |
|
yinzuomei
|
9a82f4a645
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
747ba74425
|
listresi排序调整1
|
4 years ago |
|
jianjun
|
47daf2a736
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
4 years ago |
|
jianjun
|
274212eca1
|
返回支持添加
|
4 years ago |
|
zhaoqifeng
|
ac71a67c31
|
居民防疫信息排序
|
4 years ago |
|
yinzuomei
|
bf48aef8b6
|
listresi排序调整
|
4 years ago |
|
jianjun
|
47623547b2
|
返回支持添加
|
4 years ago |
|
yinzuomei
|
51cb74e77f
|
信息采集详情
|
4 years ago |
|
jianjun
|
f810d5f819
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
