zxc
|
c7adc6c71e
|
导入修改
|
3 years ago |
|
zxc
|
d5e952e4b2
|
房屋排序
|
3 years ago |
|
zxc
|
d0bc110a56
|
房屋排序
|
3 years ago |
|
zxc
|
df919f5121
|
楼栋排序
|
3 years ago |
jianjun
|
8cb6a23b64
|
微调
|
3 years ago |
|
jianjun
|
429cf2841e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_resi_export
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# 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/impl/IcResiUserServiceImpl.java
|
3 years ago |
zhaoqifeng
|
538d97d87d
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
jianjun
|
e6017c4465
|
这个代码被删除了 恢复
|
3 years ago |
|
zhaoqifeng
|
022c7acba3
|
list转map key重复
|
3 years ago |
|
jianjun
|
edfe9b063c
|
导出返回错误信息 2
|
3 years ago |
|
jianjun
|
dbf7001c1b
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
e387fca7de
|
导出返回错误信息
|
3 years ago |
sunyuchao
|
d1f3d208c9
|
bug修改，增加同组织下模板名不能重复校验
|
3 years ago |
|
jianjun
|
d2f583f1ee
|
代码微调
|
3 years ago |
|
jianjun
|
4caebaf21c
|
代码微调
|
3 years ago |
|
zxc
|
40d6c23b75
|
排序修改
|
3 years ago |
|
zxc
|
495fbc3336
|
排序修改
|
3 years ago |
|
zxc
|
ce76dd0bb5
|
排序修改
|
3 years ago |
|
jianjun
|
050d67deda
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
a84822f745
|
添加注释
|
3 years ago |
|
zhaoqifeng
|
0ff35b0a2a
|
自定义导出模板列表及模板详情
|
3 years ago |
|
jianjun
|
c1274e2423
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
94c816662e
|
获取子节点
|
3 years ago |
|
zxc
|
6f5dae4a38
|
关注名单详情
|
3 years ago |
|
jianjun
|
75a99e42ea
|
生成id
|
3 years ago |
|
sunyuchao
|
4870264524
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java
|
3 years ago |
|
sunyuchao
|
83862a09d8
|
疫苗接种情况增加详情接口
|
3 years ago |
|
jianjun
|
61315feeb4
|
删除多余的方法
|
3 years ago |
|
jianjun
|
c7672f0f6d
|
提高可读性
|
3 years ago |
yinzuomei
|
927d60e542
|
/statsresiwarn/alluserwarnlist ***
|
3 years ago |
|
jianjun
|
adc92ef7c0
|
简化导出的dto
|
3 years ago |
|
jianjun
|
1b4ccd2d73
|
简化导出的dto
|
3 years ago |
|
jianjun
|
6636f77a0c
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
913e9b8a45
|
添加type
|
3 years ago |
|
zhaoqifeng
|
60f7a6e971
|
房屋信息修改
|
3 years ago |
|
jianjun
|
e2721549c7
|
返回
|
3 years ago |
|
jianjun
|
6e394764f4
|
排序
|
3 years ago |
|
jianjun
|
bf108f35b6
|
没删干净
|
3 years ago |
|
jianjun
|
35e596da96
|
自定义导出脚本
|
3 years ago |
|
jianjun
|
5a1d3cbfd6
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
d08fc95fdb
|
删掉字段
|
3 years ago |
wangxianzhang
|
a6acb2f0c4
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
wangxianzhang
|
bbe4f2f25e
|
居民信息导出，增加"是否办理公益性岗位"
|
3 years ago |
|
jianjun
|
abaacb9981
|
兼容老模板
|
3 years ago |
|
jianjun
|
0202dfe555
|
固定表头
|
3 years ago |
|
jianjun
|
77c2ce8518
|
需求类别处理
|
3 years ago |
|
jianjun
|
f18e54725c
|
feign错误
|
3 years ago |
|
jianjun
|
ff2d8a7f66
|
位置移动
|
3 years ago |
|
jianjun
|
5ca5f931a4
|
添加注释等
|
3 years ago |
|
jianjun
|
9199d321e3
|
添加注释等
|
3 years ago |
