sunyuchao
|
ab46a6d8c0
|
.
|
3 years ago |
zxc
|
2359f0ad99
|
楼栋更新标记
|
3 years ago |
yinzuomei
|
59d2519f44
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
yinzuomei
|
445fff3719
|
避免下空指针
|
3 years ago |
zhangyuan
|
7dd96e27c3
|
保存福利时,抹掉DTO的ID
|
3 years ago |
zhangyuan
|
740109af54
|
性别是2的情况
|
3 years ago |
jianjun
|
f4ffd9b65f
|
居民导出 sheet名字添加
|
3 years ago |
jianjun
|
0ebaa05e1c
|
easyExcel升级到最新版本
|
3 years ago |
zhaoqifeng
|
f27197eca1
|
出生管理
|
3 years ago |
zhangyuan
|
edac24c5e3
|
Merge branch 'dev_move_out_of' of http://121.42.41.42:7070/r/epmet-cloud into dev_move_out_of
|
3 years ago |
zhangyuan
|
b5b331a974
|
注释修改
|
3 years ago |
jianjun
|
3ddcf6ec1e
|
Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of
|
3 years ago |
jianjun
|
0437baf980
|
单元
|
3 years ago |
jianjun
|
40265b1991
|
Merge remote-tracking branch 'remotes/origin/dev_house_resi_export' into dev_move_out_of
|
3 years ago |
jianjun
|
5f3f6aa4fa
|
单元
|
3 years ago |
jianjun
|
9239eef774
|
Merge remote-tracking branch 'origin/dev_move_out_of' into dev_move_out_of
|
3 years ago |
jianjun
|
61807e3b9f
|
微调
|
3 years ago |
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 |