wangxianzhang
|
85d44ece28
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
2600373022
|
fix
|
4 years ago |
jianjun
|
fcd921fcb5
|
暂存
|
4 years ago |
sunyuchao
|
436504300e
|
楼栋信息导入 按需求变更修改【需求：只能导入当前登录人所属组织下数据，匹配不上的数据舍弃，将匹配不上的数据给到前端提示 如南宁社区不存在】
|
4 years ago |
|
wangxianzhang
|
42a967437d
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
900a4f04e4
|
修改：
1.修改导出excel的sheet名
|
4 years ago |
|
sunyuchao
|
e1dbdacb85
|
小区信息导入 按需求变更修改【需求：只能导入当前登录人所属组织数据，皮配不上的数据舍弃】
|
4 years ago |
|
jianjun
|
758fc22b9b
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
dc9f7ddf3f
|
大饼慢病
|
4 years ago |
yinzuomei
|
47c8e73d7b
|
房屋模板增加所属组织，所属网格
|
4 years ago |
|
wangxianzhang
|
93d48e34d2
|
修改：
暴露：Content-Disposition 头
|
4 years ago |
|
wangxianzhang
|
19ff0a98b8
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
10ab91dd0c
|
修改：-
|
4 years ago |
|
yinzuomei
|
8de5bf7984
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
7c99b0c363
|
导出房屋excel,单元号赋值
|
4 years ago |
|
jianjun
|
1a8dbdc52f
|
添加xlsx模版
|
4 years ago |
|
yinzuomei
|
c1ede5dc7f
|
@NoRepeatSubmit
|
4 years ago |
|
yinzuomei
|
d6551719b8
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
9262284ac0
|
物业平台内唯一
|
4 years ago |
lzh
|
6dd3f89793
|
更改下载的模板
|
4 years ago |
|
jianjun
|
00a495a73b
|
报错解决
|
4 years ago |
|
sunyuchao
|
9ada46f314
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
sunyuchao
|
6d18eb4e9f
|
居民基本信息设置时间字段转为str类型
|
4 years ago |
|
jianjun
|
30421b4941
|
代码暂存
|
4 years ago |
|
yinzuomei
|
df5b7cdfee
|
导出小区修改test
|
4 years ago |
|
yinzuomei
|
bf56b80966
|
参数校验提示给用户
|
4 years ago |
|
yinzuomei
|
ab4a656016
|
小区备注不必填
|
4 years ago |
|
wangxianzhang
|
33a5c0b6de
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
b8391e9965
|
修改：
pc工作端登录缓存增加部分内容
|
4 years ago |
|
yinzuomei
|
e1680e8ee2
|
小区楼宇房屋导入，判断名称唯一
|
4 years ago |
|
yinzuomei
|
a20a520d1e
|
NEIGHBOOR_NAME_EXITED
|
4 years ago |
|
yinzuomei
|
a5a5e24449
|
fadignding
|
4 years ago |
|
yinzuomei
|
08ad7e651e
|
@PostMapping("buildingunitlist")找回
|
4 years ago |
|
yinzuomei
|
a647537910
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
yinzuomei
|
c7a1d433ab
|
小区名和门牌号唯一
|
4 years ago |
|
lzh
|
5d880c618d
|
代码给覆盖了，重新提交
|
4 years ago |
|
yinzuomei
|
2adf5b6280
|
同一小区内楼栋名称不允许重复
|
4 years ago |
zhaoqifeng
|
85b0d26503
|
【基础信息】搜索人名
|
4 years ago |
|
zhaoqifeng
|
2cc38c1cc3
|
【基础信息】家庭 查询房屋修改
|
4 years ago |
|
zhaoqifeng
|
3063afb3a0
|
【基础信息】家庭 查询房屋修改
|
4 years ago |
|
wangxianzhang
|
56ab29a97d
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
wangxianzhang
|
3ea4aac18c
|
修改：
icform/items增加redis缓存
|
4 years ago |
zxc
|
e1e31c5a6f
|
个人数据
|
4 years ago |
|
wangxianzhang
|
816a08c9e6
|
修改：
1.已存在的ic居民相关信息，修改，而不跳过
|
4 years ago |
|
zhaoqifeng
|
3eb2d28cc1
|
【基础信息】搜索人名
|
4 years ago |
|
jianjun
|
aeb0c4511a
|
Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform
|
4 years ago |
|
jianjun
|
7bf2cdefd4
|
所属支部固定处理 代调整
|
4 years ago |
|
zxc
|
9e3faebf7c
|
个人数据
|
4 years ago |
|
zxc
|
cf009d463a
|
Merge remote-tracking branch 'origin/dev_add_closedCount_category' into dev_ic_platform
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
4 years ago |
|
zxc
|
e2fd041179
|
查询志愿者类别
|
4 years ago |
