jianjun
|
0ebaa05e1c
|
easyExcel升级到最新版本
|
3 years ago |
|
jianjun
|
0437baf980
|
单元
|
3 years ago |
|
jianjun
|
5f3f6aa4fa
|
单元
|
3 years ago |
|
jianjun
|
3a8caddabc
|
精简字段2
|
3 years ago |
|
jianjun
|
74dc46184d
|
精简字段
|
3 years ago |
|
jianjun
|
d283f41c07
|
改个名
|
3 years ago |
|
jianjun
|
ebc038f89c
|
导出一房一档信息
|
3 years ago |
|
jianjun
|
a27bdb44eb
|
恢复
|
3 years ago |
|
jianjun
|
d2ae84dc81
|
导出一户一档 暂存3
|
3 years ago |
|
jianjun
|
67abec4113
|
导出一户一档 暂存2
|
3 years ago |
|
jianjun
|
64e2f6e195
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_house_resi_export
|
3 years ago |
|
jianjun
|
f13582b5aa
|
导出一户一档 暂存
|
3 years ago |
wangxianzhang
|
216fb26c86
|
居民信息模板变更。"居民基本信息录入表"sheet中的备注，挪动到了"基础信息"下
|
3 years ago |
zxc
|
cd09ae214a
|
Merge branch 'dev_resi_export' into dev
|
3 years ago |
YUJT
|
db5dc52c25
|
新增居民端党员风采接口
|
3 years ago |
|
zxc
|
188eff0e56
|
楼栋导入新增修改楼栋类型
|
3 years ago |
|
zxc
|
f49151d476
|
去除多余判断
|
3 years ago |
|
zxc
|
601c85057c
|
sort default 0
|
3 years ago |
|
zxc
|
1366c8e0ac
|
小区导入bug修复
|
3 years ago |
|
zxc
|
75bd0eb8bb
|
房屋导入微调
|
3 years ago |
|
jianjun
|
6736ef1f1f
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
3 years ago |
zhaoqifeng
|
86023faa67
|
个人信息
|
3 years ago |
|
jianjun
|
14cbe024d9
|
合并冲突解决
|
3 years ago |
|
jianjun
|
5a151ab746
|
Merge remote-tracking branch 'remotes/origin/back' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
# 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 |
|
jianjun
|
e88a9f13f1
|
Merge remote-tracking branch 'remotes/origin/dev_resi_export' into dev
# Conflicts:
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
|
3 years ago |
yinzuomei
|
f9bbcb5605
|
修改房屋，删除房屋缓存
|
3 years ago |
|
zhaoqifeng
|
1459a2b36d
|
房屋管理左侧树排序
|
3 years ago |
|
zxc
|
3575b1f2f9
|
sort
|
3 years ago |
|
zhaoqifeng
|
f9d4b2c406
|
房屋管理左侧树排序
|
3 years ago |
|
yinzuomei
|
9a82f4a645
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
yinzuomei
|
747ba74425
|
listresi排序调整1
|
3 years ago |
|
jianjun
|
47daf2a736
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
jianjun
|
274212eca1
|
返回支持添加
|
3 years ago |
|
zhaoqifeng
|
ac71a67c31
|
居民防疫信息排序
|
3 years ago |
|
yinzuomei
|
bf48aef8b6
|
listresi排序调整
|
3 years ago |
|
jianjun
|
47623547b2
|
返回支持添加
|
3 years ago |
|
yinzuomei
|
51cb74e77f
|
信息采集详情
|
3 years ago |
|
jianjun
|
f810d5f819
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
59770de0cb
|
只合并改合并的
|
3 years ago |
|
zxc
|
cd81ac7b6a
|
url
|
3 years ago |
wangxianzhang
|
58093e0b03
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
7b9300be4c
|
居民信息导入的时候，对datapicker和datarange空间的内容进行正则解析判断，和格式转换
|
3 years ago |
|
jianjun
|
95ace290f7
|
隐藏列原始值加密
|
3 years ago |
|
jianjun
|
4303f3cc64
|
do语句被短路
|
3 years ago |
|
jianjun
|
49d92147ad
|
添加设置列宽策略
|
3 years ago |
|
zxc
|
c6b32326fd
|
楼栋，房屋列表新增倒序正序传参
|
3 years ago |
|
zxc
|
1caf1b9244
|
楼栋，房屋列表新增倒序正序传参
|
3 years ago |
|
jianjun
|
d4d995e2eb
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
929aea9565
|
获取需求分类
|
3 years ago |
|
zxc
|
eb9ce1cb89
|
楼栋修改
|
3 years ago |
