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 |
zhaoqifeng
|
3bcb43d803
|
家庭成员迁出修改
|
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 |
HAHA
|
ba870a4e62
|
新增返回字段
|
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 |
|
HAHA
|
39cb2329f5
|
修改抛出异常信息
|
3 years ago |
YUJT
|
cf7eacc25e
|
Merge branch 'master' into feature/dev_zz_wgh
|
3 years ago |
|
zhaoqifeng
|
97e6688b02
|
家庭成员迁出修改
|
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 |
|
zhaoqifeng
|
2de0f5a5b5
|
家庭成员迁出
|
3 years ago |
|
HAHA
|
7e3d101009
|
修改flyway脚本
|
3 years ago |
|
wangxianzhang
|
d196b50cbf
|
被出租车溅裤脚上水了...
|
3 years ago |
|
yinzuomei
|
9dbc03fe7f
|
隐患明细最多500，场所名称最多100
|
3 years ago |
|
yinzuomei
|
f8296135f3
|
xiugai
|
3 years ago |
|
zhaoqifeng
|
486ebba8b7
|
家庭成员迁出
|
3 years ago |
|
wangxianzhang
|
a707ddafec
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
wangxianzhang
|
18ef454c80
|
【五大图层】如果该客户没有初始化分类字典，那就使用默认分类字典
|
3 years ago |
|
yinzuomei
|
e6053d25d7
|
converagedict
|
3 years ago |
|
HAHA
|
caed286df8
|
添加flyway脚本，修改视图名
|
3 years ago |
|
wangxianzhang
|
678e12a833
|
Merge branch 'dev_5big_coverage' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_5big_coverage
|
3 years ago |
|
wangxianzhang
|
de9c226eae
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
yinzuomei
|
d4ef8fc14e
|
企事业单位
|
3 years ago |
|
wangxianzhang
|
8e35cc20bf
|
【五大图层】查询数据列表多线程提高效率；/resi-brief接口增加人户状况和工作单位的字段
|
3 years ago |
|
zhaoqifeng
|
d2e5a35d27
|
家庭成员迁出
|
3 years ago |
|
yinzuomei
|
4cf4b98b0c
|
更新场所时获取下最新的记录
|
3 years ago |
