zxc
|
2d6e682c10
|
暂提
|
3 years ago |
|
zxc
|
d19cca0057
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_import_edit
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/dao/IcNeighborHoodDao.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 |
jianjun
|
e2721549c7
|
返回
|
3 years ago |
|
zxc
|
7a2ff5af56
|
暂提
|
3 years ago |
|
jianjun
|
6e394764f4
|
排序
|
3 years ago |
|
jianjun
|
bf108f35b6
|
没删干净
|
3 years ago |
|
zxc
|
dd301aabdf
|
小区导入修改
|
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 |
|
jianjun
|
a47ee45f94
|
自定义导出处理需求的item值
|
3 years ago |
yinzuomei
|
3beb0d7839
|
居民信息列表需求分类展示一级分类名称，去重
|
3 years ago |
|
yinzuomei
|
2f5701c220
|
icneighborhood/open/list
|
3 years ago |
|
yinzuomei
|
943000ff25
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
|
3 years ago |
zhangyuan
|
f3f342137e
|
Merge branch 'dev_contract' into dev
|
3 years ago |
|
zhangyuan
|
0e425a33a8
|
增加插入用户以及头像等的逻辑
|
3 years ago |
|
yinzuomei
|
2f12980ec9
|
icneighborhood/open/list
|
3 years ago |
|
jianjun
|
9b6b42a5db
|
自定义导出 合并单元格2
|
3 years ago |
|
yinzuomei
|
924b02596a
|
注释放开
|
3 years ago |
zhaoqifeng
|
6482c2ac1b
|
模板列表添加创建人和创建时间
|
3 years ago |
|
jianjun
|
129e04950e
|
Merge branch 'dev_resi_export' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_resi_export
|
3 years ago |
|
jianjun
|
28c4680760
|
自定义导出 合并单元格2
|
3 years ago |
|
zhaoqifeng
|
8888ce7178
|
模板列表添加创建人和创建时间
|
3 years ago |
|
zhaoqifeng
|
7684b872a4
|
模板列表添加创建人和创建时间
|
3 years ago |
|
yinzuomei
|
1f01f4a9ae
|
字典表增加组件查询方式
|
3 years ago |
|
jianjun
|
e6b8e4d97c
|
自定义导出 合并单元格
|
3 years ago |
|
jianjun
|
f39cfecb6d
|
自定义导出 合并单元格
|
3 years ago |
|
yinzuomei
|
0fbddc0bd5
|
groupByTables url
|
3 years ago |
|
yinzuomei
|
f4a002d0f3
|
groupByTables
|
3 years ago |
|
zxc
|
ba2e697158
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
|
3 years ago |
|
zxc
|
b67720aab3
|
em
|
3 years ago |
|
zxc
|
7a9d5a25c8
|
楼栋修改新增修改房屋名字
|
3 years ago |
|
yinzuomei
|
e4180818ad
|
/icresiuser/searchbycategory修改
|
3 years ago |
|
zhaoqifeng
|
7e5d96dbeb
|
删除模板
|
3 years ago |
|
jianjun
|
8493e9592d
|
自定义导出
|
3 years ago |
|
jianjun
|
4d1f03f219
|
代码暂存
|
3 years ago |
|
jianjun
|
70a269d91d
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
jianjun
|
329d8ac9e1
|
添加多选
|
3 years ago |
|
zhaoqifeng
|
96e4abc552
|
自定义导出模板列表及模板详情
|
3 years ago |
sunyuchao
|
1b0cd87e27
|
Merge remote-tracking branch 'origin/dev_resi_export' into dev_resi_export
|
3 years ago |
|
sunyuchao
|
7278a2e464
|
居民信息自定义模板导出——保存模板
|
3 years ago |
