jianjun
|
b2f8d5b862
|
获取需要导出的配置 用于生成excel 3
|
4 years ago |
yinzuomei
|
2f1319efce
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
4972307c4e
|
list_equal
|
4 years ago |
|
jianjun
|
fbc1cb5c62
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into develop
|
4 years ago |
|
jianjun
|
061b725fa9
|
获取需要导出的配置 用于生成excel
|
4 years ago |
|
jianjun
|
8f6ef87138
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
jianjun
|
55b6b9062c
|
获取需要导出的配置 用于生成excel
|
4 years ago |
|
yinzuomei
|
c900f867f6
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
4d525ae2b2
|
行程上报详情
|
4 years ago |
wangxianzhang
|
f3ceb1f666
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
1a51ce4bd1
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
4 years ago |
|
wangxianzhang
|
ca16ad29f0
|
修改：居民信息导入的模板，基础信息拆分为2级表头
|
4 years ago |
|
yinzuomei
|
c83c7f7543
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
yinzuomei
|
47ca3ec7d2
|
ic_form_query_builder.validType
|
4 years ago |
|
jianjun
|
ff2850d132
|
返回code
|
4 years ago |
|
jianjun
|
f3ff791ec3
|
查询自定义配置de导出的表头和字段 按顺序返回并对应
|
4 years ago |
YUJT
|
f037cfca48
|
Merge branch 'develop' of http://121.42.41.42:7070/r/epmet-cloud into develop
|
4 years ago |
|
YUJT
|
b62a11b905
|
合并分支
|
4 years ago |
|
yinzuomei
|
210285de9f
|
Merge remote-tracking branch 'origin/dev_resi_export' into develop
|
4 years ago |
|
yinzuomei
|
3f45eb906b
|
去掉吧
|
4 years ago |
|
yinzuomei
|
1903169f62
|
去掉吧
|
4 years ago |
|
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 |
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 |
