yinzuomei
|
06ac829cad
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
d0351bb719
|
test
|
4 years ago |
|
yinzuomei
|
789c4eb038
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
jianjun
|
c7fc8f48a3
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
jianjun
|
1efd3cd663
|
工具类暂存
|
4 years ago |
|
yinzuomei
|
b9d4db1414
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
8ec479a293
|
==
|
4 years ago |
|
yinzuomei
|
26a51955da
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
9d0cc9c37d
|
！
|
4 years ago |
|
yinzuomei
|
75a279cc87
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
4 years ago |
|
yinzuomei
|
e00aa5d2d2
|
试试notnull
|
4 years ago |
wangxianzhang
|
3d318fb2d3
|
核酸检测导入增加app，client等的日志
|
4 years ago |
sunyuchao
|
fe518f72e1
|
人房概览_下级概览列表
|
4 years ago |
|
yinzuomei
|
aaa3f995c4
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
a95eafbbe8
|
/icform/conditionlist-bygroup label+queryType+funType返回
|
4 years ago |
|
yinzuomei
|
12a5b0c429
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
5dfe33e9f7
|
/icform/conditionlist-bygroup
|
4 years ago |
|
yinzuomei
|
f0adbd50cd
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
4cb9f71725
|
调整ic_form_item_group.sort
|
4 years ago |
|
sunyuchao
|
125a703df2
|
人房概览_居民饼图
|
4 years ago |
|
jianjun
|
f7a7f9a44a
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
jianjun
|
7ac39714a0
|
自定义模板导出代码 暂存
|
4 years ago |
|
yinzuomei
|
95828d5f28
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
9573d11b2c
|
新增了一些查询组件。修改ic_form_item.search_display='1'
|
4 years ago |
zhaoqifeng
|
7e01bd6a77
|
人员预警列表
|
4 years ago |
|
yinzuomei
|
5434d39a51
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
906bb577d6
|
退役军人ic_veterans表新增IS_HANDLE_JOB是否办理公益性岗位
|
4 years ago |
|
sunyuchao
|
7682f410ae
|
人房概览_房屋饼图
|
4 years ago |
|
wangxianzhang
|
7ec05ac6fd
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
ca95e2ab60
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
wangxianzhang
|
904f9a92b4
|
将身份证号的打码方式，改为正则替换
|
4 years ago |
|
yinzuomei
|
35ee1d175d
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
6fac3b8057
|
/icresiuser/detail接口修改
|
4 years ago |
|
wangxianzhang
|
5a9f621eca
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
832a3edfec
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
4 years ago |
|
wangxianzhang
|
a372b0bd67
|
map中的mobile和idcard打码
|
4 years ago |
|
yinzuomei
|
5c4a8ebe15
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
a40d61d6b5
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
29c31edb8d
|
/icform/getcustomerform 表单基础信息查询
|
4 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
|
4 years ago |
|
wangxianzhang
|
a96506718d
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
4 years ago |
|
wangxianzhang
|
c796d4a37b
|
身份证号和手机号打码
|
4 years ago |
|
yinzuomei
|
dc2d0269c7
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
8b91d95fd6
|
queryConditions修改
|
4 years ago |
|
yinzuomei
|
244defe67e
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
yinzuomei
|
cf4d356955
|
查询子表！=ic_resi_user
|
4 years ago |
|
zhaoqifeng
|
9c7cb8576d
|
Merge branch 'dev_resi_export' into develop
|
4 years ago |
|
zhaoqifeng
|
37fb4042fa
|
房屋详情
|
4 years ago |
zxc
|
fe75dcfc5b
|
去除排序
|
4 years ago |
YUJT
|
d4f36ec9f7
|
新增接口，查询房屋家庭成员
|
4 years ago |
