sunyuchao
|
61bcf9b10d
|
Merge branch 'dev_renwu700_syc'
|
3 years ago |
|
sunyuchao
|
05a1ed431f
|
房屋名称
|
3 years ago |
|
sunyuchao
|
ca7e30a23b
|
Merge branch 'dev_renwu700_syc'
|
3 years ago |
|
sunyuchao
|
e1ded8b49d
|
。。。
|
3 years ago |
wangxianzhang
|
2496c3115d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
sunyuchao
|
16ccd16991
|
房屋新增、修改时名字带'单元'二字
|
3 years ago |
yinzuomei
|
b50dbb5883
|
调整下顺序
|
3 years ago |
|
sunyuchao
|
31b57d14a6
|
Merge branches 'dev_renwu700_syc' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_renwu700_syc
|
3 years ago |
|
yinzuomei
|
61bbb17727
|
CHILD_SHOW_FLAG脚本放错位置了
|
3 years ago |
|
yinzuomei
|
d4d5473498
|
CHILD_SHOW_FLAG
|
3 years ago |
|
sunyuchao
|
f3f02deeeb
|
代码还原
|
3 years ago |
|
sunyuchao
|
db54ff9e47
|
应顺德居要求部分十八类对应表单不显示，对应的数据库修改DISPLAY为展示，sql增加查询条件
|
3 years ago |
|
yinzuomei
|
18ea57bb18
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj'
|
3 years ago |
|
yinzuomei
|
6594e67d48
|
try
|
3 years ago |
|
sunyuchao
|
0c8cc30db7
|
接口增加返参
|
3 years ago |
|
sunyuchao
|
414b68908c
|
人员图谱-个人详情里显示的房屋信息由显示本人是房东的房屋信息改为显示当前人员居住的房屋信息
|
3 years ago |
|
wangxianzhang
|
8cbc303a32
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
zhangyuan
|
a5446eaee2
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
3b0922ef4d
|
无用引用
|
3 years ago |
|
zhangyuan
|
44065fefd4
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
d5e70a7068
|
不再有退卡了
|
3 years ago |
|
zhangyuan
|
ff95c1befe
|
Merge branch 'feature/visitor2_zhy'
|
3 years ago |
|
zhangyuan
|
b21ff55926
|
顺德居逻辑
|
3 years ago |
zxc
|
546488cff7
|
Merge branch 'dev_0906_new_demand'
|
3 years ago |
|
zxc
|
11a362654f
|
emm
|
3 years ago |
|
zxc
|
9924db162a
|
emm
|
3 years ago |
|
yinzuomei
|
b3d8ae3b10
|
Merge remote-tracking branch 'origin/dev_ylfn'
# Conflicts:
# 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 |
|
yinzuomei
|
540204bdbc
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
|
zxc
|
aef7cfe939
|
新字段
|
3 years ago |
|
yinzuomei
|
396103b816
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
|
zxc
|
ebac3e2243
|
新字段
|
3 years ago |
zhaoqifeng
|
4b06c587f7
|
更新是否育龄妇女定时任务
|
3 years ago |
|
zhaoqifeng
|
06cc5e8ac4
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
038b8c47ca
|
不等于空串
|
3 years ago |
|
zhaoqifeng
|
c14fd64161
|
更新是否育龄妇女定时任务
|
3 years ago |
|
yinzuomei
|
32547af4c7
|
Merge remote-tracking branch 'origin/dev_ic_user_houe_statis_syc'
|
3 years ago |
|
zhaoqifeng
|
71f57815e7
|
Merge branches 'dev_ylfn' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ylfn
|
3 years ago |
|
yinzuomei
|
d348a1c833
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
yinzuomei
|
2e1af3c9f5
|
Merge remote-tracking branch 'origin/dev_0906_new_demand'
|
3 years ago |
wangxianzhang
|
5bd15bb4bb
|
证件号工具类增加年龄计算
|
3 years ago |
|
wangxianzhang
|
ac37d2fb7d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
yinzuomei
|
ecc2d44161
|
buig
|
3 years ago |
|
yinzuomei
|
bd5706aa6c
|
ic_resi_category_stats_config调整
|
3 years ago |
|
yinzuomei
|
6ab99298d7
|
居民类别配置调整
|
3 years ago |
|
zxc
|
eadc1c9bff
|
新字段
|
3 years ago |
|
yinzuomei
|
048845be8b
|
Merge remote-tracking branch 'origin/dev_party_helper'
|
3 years ago |
|
yinzuomei
|
2e260ff834
|
gov_party_helper
|
3 years ago |
|
sunyuchao
|
304fd62c86
|
人防概览下钻接口bug修改
|
3 years ago |
|
zxc
|
ce60644b40
|
新字段
|
3 years ago |
|
zxc
|
faa1a9ed50
|
新字段
|
3 years ago |
