zhaoqifeng
|
90fffb54d6
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
03ba21348f
|
Merge branch 'dev_optimize' into dev
|
4 years ago |
|
zhaoqifeng
|
6c47580927
|
Merge branch 'dev_optimize' into develop
|
4 years ago |
|
zhaoqifeng
|
b2564c7321
|
bug修改
|
4 years ago |
|
zhaoqifeng
|
d5e813b1d3
|
Merge branch 'dev_optimize' into develop
|
4 years ago |
|
zhaoqifeng
|
ce1e388709
|
bug修改
|
4 years ago |
zxc
|
a65db381b4
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
zxc
|
612fcc050f
|
house导入
|
4 years ago |
jianjun
|
d1ab33f129
|
自定义模板导出代码
|
4 years ago |
yinzuomei
|
86354d5dd6
|
ic_form_query_builder新增item_type,label,fun_type
|
4 years ago |
|
zxc
|
383e832219
|
build导入
|
4 years ago |
|
zxc
|
6de1e21fb9
|
building修改
|
4 years ago |
|
zxc
|
8cbd0dd038
|
sql
|
4 years ago |
|
zxc
|
6dab1ef92c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
759893a96c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
8ca7ba08a1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
99b70cd058
|
项目关闭防重复提交
|
4 years ago |
|
yinzuomei
|
5b0180ceaa
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
jianjun
|
7eeccc2647
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
fc3604a84f
|
获取房屋列表
|
4 years ago |
|
jianjun
|
e9bacc926a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
2f7d151724
|
单元代码合并错误
|
4 years ago |
|
yinzuomei
|
35ce4ca3e6
|
/customerstaff/staffbasicinfo返回areaCode
|
4 years ago |
|
zhaoqifeng
|
21dd439cfd
|
人员预警列表
|
4 years ago |
|
jianjun
|
c8e75b2add
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
43d9adff3b
|
单元设置id
|
4 years ago |
sunyuchao
|
3f03a2f372
|
人房概览数据统计方法模板
|
4 years ago |
|
jianjun
|
ba801742fe
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
6936a1c444
|
导出bug 未发现改了改
|
4 years ago |
wangxianzhang
|
6e7359f2e4
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
267d060998
|
漏了
|
4 years ago |
|
wangxianzhang
|
85952ab224
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
23521b98b8
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
wangxianzhang
|
1ccfbc0f7e
|
修改：(1)根据身份证号解析年龄、生日、性别，且模板中删除"性别","出生日期"2列。(2)根据解析出的年龄判断 是否为老年人，自动填充该标记为true
|
4 years ago |
|
zxc
|
441200eca0
|
Merge branch 'dev_resi_export' into develop
|
4 years ago |
|
zxc
|
67efe2f55c
|
新增实际录入总数
|
4 years ago |
|
zhaoqifeng
|
94ccf15b9b
|
Merge branch 'dev_optimize' into develop
|
4 years ago |
|
zhaoqifeng
|
de00b0536d
|
联建活动添加网格
|
4 years ago |
|
jianjun
|
04f9d75577
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
b37b0d35c5
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
4 years ago |
|
jianjun
|
e772c238df
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_optimize
|
4 years ago |
|
zhaoqifeng
|
e1980289b7
|
Merge branch 'dev_optimize' into develop
|
4 years ago |
|
jianjun
|
8bcb383c47
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
4 years ago |
|
zhaoqifeng
|
7f512791ca
|
房屋列表返回房屋状态
|
4 years ago |
|
jianjun
|
9bd4395760
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
4 years ago |
|
zhaoqifeng
|
bd4c735396
|
Merge branch 'dev_optimize' into develop
|
4 years ago |
|
zhaoqifeng
|
889c52ffe9
|
一个房屋下只有一个户主
|
4 years ago |
|
wangxianzhang
|
5f97fb6549
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
b99e059ec4
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
2de113af08
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
