yinzuomei
|
95828d5f28
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
9573d11b2c
|
新增了一些查询组件。修改ic_form_item.search_display='1'
|
3 years ago |
zhaoqifeng
|
7e01bd6a77
|
人员预警列表
|
3 years ago |
|
yinzuomei
|
5434d39a51
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
906bb577d6
|
退役军人ic_veterans表新增IS_HANDLE_JOB是否办理公益性岗位
|
3 years ago |
sunyuchao
|
7682f410ae
|
人房概览_房屋饼图
|
3 years ago |
wangxianzhang
|
7ec05ac6fd
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
ca95e2ab60
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
904f9a92b4
|
将身份证号的打码方式，改为正则替换
|
3 years ago |
|
yinzuomei
|
35ee1d175d
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
3 years ago |
|
yinzuomei
|
6fac3b8057
|
/icresiuser/detail接口修改
|
3 years ago |
|
wangxianzhang
|
5a9f621eca
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
832a3edfec
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
a372b0bd67
|
map中的mobile和idcard打码
|
3 years ago |
|
yinzuomei
|
5c4a8ebe15
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
3 years ago |
|
yinzuomei
|
a40d61d6b5
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
29c31edb8d
|
/icform/getcustomerform 表单基础信息查询
|
3 years ago |
|
wangxianzhang
|
22f1b2a306
|
Merge branch 'dev_resi_export' 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/controller/HouseController.java
|
3 years ago |
|
wangxianzhang
|
a96506718d
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
c796d4a37b
|
身份证号和手机号打码
|
3 years ago |
|
yinzuomei
|
dc2d0269c7
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
3 years ago |
|
yinzuomei
|
8b91d95fd6
|
queryConditions修改
|
3 years ago |
|
yinzuomei
|
244defe67e
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
cf4d356955
|
查询子表！=ic_resi_user
|
3 years ago |
|
zhaoqifeng
|
9c7cb8576d
|
Merge branch 'dev_resi_export' into develop
|
3 years ago |
|
zhaoqifeng
|
37fb4042fa
|
房屋详情
|
3 years ago |
zxc
|
fe75dcfc5b
|
去除排序
|
3 years ago |
YUJT
|
d4f36ec9f7
|
新增接口，查询房屋家庭成员
|
3 years ago |
|
zhaoqifeng
|
90fffb54d6
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
03ba21348f
|
Merge branch 'dev_optimize' into dev
|
3 years ago |
|
zhaoqifeng
|
6c47580927
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
|
zhaoqifeng
|
b2564c7321
|
bug修改
|
3 years ago |
|
zhaoqifeng
|
d5e813b1d3
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
|
zhaoqifeng
|
ce1e388709
|
bug修改
|
3 years ago |
|
zxc
|
a65db381b4
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
3 years ago |
|
zxc
|
612fcc050f
|
house导入
|
3 years ago |
jianjun
|
d1ab33f129
|
自定义模板导出代码
|
3 years ago |
|
yinzuomei
|
86354d5dd6
|
ic_form_query_builder新增item_type,label,fun_type
|
3 years ago |
|
zxc
|
383e832219
|
build导入
|
3 years ago |
|
zxc
|
6de1e21fb9
|
building修改
|
3 years ago |
|
zxc
|
8cbd0dd038
|
sql
|
3 years ago |
|
zxc
|
6dab1ef92c
|
Merge remote-tracking branch 'origin/dev'
|
3 years ago |
|
zxc
|
759893a96c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
8ca7ba08a1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
3 years ago |
|
zxc
|
99b70cd058
|
项目关闭防重复提交
|
3 years ago |
|
yinzuomei
|
5b0180ceaa
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
3 years ago |
|
jianjun
|
7eeccc2647
|
Merge remote-tracking branch 'remotes/origin/dev'
|
3 years ago |
|
jianjun
|
fc3604a84f
|
获取房屋列表
|
3 years ago |
|
jianjun
|
e9bacc926a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
2f7d151724
|
单元代码合并错误
|
3 years ago |
