wangxianzhang
|
f11fddc5b2
|
/resi-brief接口中对志愿者的查询，查不到字典不再抛出异常，而是打印error日志
|
3 years ago |
zxc
|
c1967b360b
|
emm
|
3 years ago |
jianjun
|
b61c8e7690
|
1
|
3 years ago |
|
jianjun
|
67b11d7d89
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_5big_coverage
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.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
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
3 years ago |
|
jianjun
|
799ed4627b
|
1
|
3 years ago |
|
jianjun
|
48b93f729b
|
防重复提交 token为空则直接跳过
|
3 years ago |
yinzuomei
|
9a6f304952
|
jign经度纬度
|
3 years ago |
|
zxc
|
f600955f76
|
社区自组织防重复提交去除
|
3 years ago |
|
yinzuomei
|
94c94694b2
|
/userdemand/category-analysis
|
3 years ago |
|
yinzuomei
|
06374f9283
|
serviceShowName
|
3 years ago |
|
wangxianzhang
|
a7722fdab1
|
【五大图层】数据查询，如果不分页，则只返回类别和坐标数据，不返回相应的name
|
3 years ago |
|
yinzuomei
|
21064837a3
|
DemandAnalysisLegendEnum
|
3 years ago |
|
yinzuomei
|
0505c83b1d
|
数据分析-服务措施分析-柱状图
|
3 years ago |
|
yinzuomei
|
b5b1eebd5e
|
=null
|
3 years ago |
|
yinzuomei
|
44e57b9f8e
|
暂存别上生产。3
|
3 years ago |
|
yinzuomei
|
80fd38fa0d
|
暂存别上生产。2
|
3 years ago |
sunyuchao
|
e4366a51c8
|
图层字典表数据初始化加入数字平台客户初始化中
|
3 years ago |
|
sunyuchao
|
8304a32c3f
|
图层字典表数据初始化加入数字平台客户初始化中
|
3 years ago |
|
yinzuomei
|
c4cebaab34
|
暂存别上生产。
|
3 years ago |
|
yinzuomei
|
28ff0d820b
|
指派给志愿者，查询的是居民信息里的志愿者信息
|
3 years ago |
|
jianjun
|
768ae5545e
|
Merge branch 'master' into dev_5big_coverage
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
yinzuomei
|
62ad74cb8e
|
模板修改
|
3 years ago |
|
jianjun
|
dd87b4f21d
|
Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
e04b5ba225
|
按组织查询时 去除空值
|
3 years ago |
|
jianjun
|
74ba7fa2f9
|
Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
a816ad21f6
|
按组织查询时 去除空值
|
3 years ago |
|
jianjun
|
076cda8f49
|
Revert "按组织查询时 去除空值"
This reverts commit 4cb19d1f
|
3 years ago |
|
jianjun
|
5c509397c4
|
Merge branch 'dev_resi_search_agency' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
4cb19d1f40
|
按组织查询时 去除空值
|
3 years ago |
|
jianjun
|
a83f604211
|
Merge remote-tracking branch 'remotes/origin/dev_resi_search_agency'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
b4cfac904c
|
重新插入一遍图层分类的字典 sql
|
3 years ago |
|
jianjun
|
b0fd7277fc
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
jianjun
|
0ece83a901
|
更新房屋内的居民数量
|
3 years ago |
|
wangxianzhang
|
298a632688
|
Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_5big_coverage
|
3 years ago |
|
jianjun
|
3beb04c45f
|
释放锁
|
3 years ago |
|
yinzuomei
|
2ea49d3583
|
1
|
3 years ago |
|
sunyuchao
|
6ab82c9b07
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
jianjun
|
3f2f2d3520
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
|
3 years ago |
|
jianjun
|
21566caf3b
|
释放锁
|
3 years ago |
|
yinzuomei
|
7d55f1aab4
|
网格内名称唯一
|
3 years ago |
YUJT
|
cf7eacc25e
|
Merge branch 'master' into feature/dev_zz_wgh
|
3 years ago |
|
yinzuomei
|
c6665639b1
|
/resi/mine/mygrid/latestgridinfo?appId=XX调整
|
3 years ago |
|
jianjun
|
887f304ada
|
更新房屋内的居民数量
|
3 years ago |
|
jianjun
|
519cfa1cd1
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
jianjun
|
297cfa92f2
|
更新房屋内的居民数量
|
3 years ago |
|
wangxianzhang
|
1c8e4c809e
|
houseEntity.resiNumber类型调整
|
3 years ago |
HAHA
|
406070bf00
|
添加flyway脚本
|
3 years ago |
|
wangxianzhang
|
2d1bd64dbe
|
houseEntity.resiNumber类型调整
|
3 years ago |
|
sunyuchao
|
d09f7eace0
|
导入重名校验
|
3 years ago |
|
wangxianzhang
|
d153c426ce
|
修复初始化house orgIdPath的错误
|
3 years ago |
