sunyuchao
|
d3cbe27c61
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
sunyuchao
|
d2ee9a9f7e
|
.
|
3 years ago |
yinzuomei
|
32ae7cd4b8
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
7ceadc91ac
|
房屋已删除
|
3 years ago |
zxc
|
b2bc9f6287
|
房屋变更记录列表微调
|
3 years ago |
|
yinzuomei
|
614d47d49a
|
迁出理由修改长度。moveResi注释
|
3 years ago |
|
yinzuomei
|
254f93a921
|
出生调一下顺序
|
3 years ago |
|
yinzuomei
|
64c5c81ea1
|
迁出
|
3 years ago |
|
yinzuomei
|
ffaf0a5567
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
f89e1c4962
|
改为迁入登记+出生登记时生成调动记录，迁出不生成，因为迁出时所选择房屋不生效
|
3 years ago |
jianjun
|
908409ae97
|
序列化
|
3 years ago |
|
jianjun
|
4e08ce53ee
|
迁入的导出列宽调整
|
3 years ago |
|
jianjun
|
427ca1d9e3
|
迁入的导出的时间不对
|
3 years ago |
|
jianjun
|
da805f0e8e
|
Revert "迁入的导出的时间不对"
This reverts commit 66b83f3c
|
3 years ago |
|
jianjun
|
66b83f3c99
|
迁入的导出的时间不对
|
3 years ago |
|
jianjun
|
a905c50345
|
Merge branch 'dev_move_out_of' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_move_out_of
|
3 years ago |
|
jianjun
|
74ea5e11f4
|
出生和迁入的导出 调整
|
3 years ago |
|
yinzuomei
|
0a09729c44
|
ss先放开
|
3 years ago |
|
yinzuomei
|
5653b8ec5c
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
7e7c1a8be5
|
迁入需要将用户状态置为-正常
|
3 years ago |
Jackwang
|
5be078c37c
|
搜索调整
|
3 years ago |
|
yinzuomei
|
184952719b
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
4aff375dbc
|
换下顺序
|
3 years ago |
|
sunyuchao
|
babe014d1b
|
迁入管理 sql脚本
|
3 years ago |
|
sunyuchao
|
6c9e59c770
|
迁入管理
|
3 years ago |
|
yinzuomei
|
de753474c4
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
f2ef904d68
|
change
|
3 years ago |
|
jianjun
|
6b5527945a
|
合并错误
|
3 years ago |
|
jianjun
|
0c26a7475d
|
Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
|
jianjun
|
3a8caddabc
|
精简字段2
|
3 years ago |
|
jianjun
|
74dc46184d
|
精简字段
|
3 years ago |
zhaoqifeng
|
06ed08917f
|
出生管理
|
3 years ago |
|
zhaoqifeng
|
6fd50f46f3
|
出生管理
|
3 years ago |
|
jianjun
|
7aeb31b9b6
|
Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of
|
3 years ago |
|
jianjun
|
d283f41c07
|
改个名
|
3 years ago |
|
sunyuchao
|
0ccc4dd333
|
迁入管理 创建时间倒序
|
3 years ago |
|
sunyuchao
|
f0a333a6e1
|
迁入管理
|
3 years ago |
|
sunyuchao
|
21ceea94d1
|
迁入管理
|
3 years ago |
|
jianjun
|
ed13faedbf
|
Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.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
|
3 years ago |
|
jianjun
|
684fc4d189
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev_move_out_of
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
|
jianjun
|
ebc038f89c
|
导出一房一档信息
|
3 years ago |
|
yinzuomei
|
3d0465c479
|
change
|
3 years ago |
|
zhaoqifeng
|
c901d7a2dd
|
出生管理
|
3 years ago |
|
sunyuchao
|
aea88e3bc9
|
迁入管理
|
3 years ago |
|
yinzuomei
|
ae5bb246e6
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
|
yinzuomei
|
c30d869f5e
|
修改moveResi
|
3 years ago |
|
Jackwang
|
57c5a02fb6
|
死亡时间格式化
|
3 years ago |
|
Jackwang
|
50e61c4110
|
列表添加脱敏处理-修改
|
3 years ago |
|
Jackwang
|
5c02f8ce64
|
列表添加脱敏处理
|
3 years ago |
|
sunyuchao
|
ed75b97fdc
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
