jianjun
|
9bd4395760
|
Merge remote-tracking branch 'remotes/origin/dev_epidemic_situation' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
3 years ago |
zhaoqifeng
|
889c52ffe9
|
一个房屋下只有一个户主
|
3 years ago |
wangxianzhang
|
b99e059ec4
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
wangxianzhang
|
639af5c1f5
|
-
|
3 years ago |
|
zhaoqifeng
|
6d0e551157
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
zhaoqifeng
|
114d901ad0
|
项目统计检测sql修改
|
3 years ago |
|
wangxianzhang
|
4bc3710435
|
改造【核酸检测导入】【居民信息导入】【疫苗接种导入】的importTask传输，封装了工具类，减少代码。调整FileItem临时文件的一些代码
|
3 years ago |
zxc
|
56303cb484
|
房屋信息
|
3 years ago |
|
zhaoqifeng
|
0c98c87616
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
wangxianzhang
|
329c37c057
|
导入时增加IS_TENANT/IS_FLOATING的默认值
|
3 years ago |
|
zhaoqifeng
|
dc261c2f9f
|
与房主关系是本人的，为房主
|
3 years ago |
|
wangxianzhang
|
d719d15f63
|
新增：importTask接口对应的工具类ImportTaskUtils，用起来更清爽
|
3 years ago |
|
jianjun
|
7755de11f6
|
下载模板代码调整
|
3 years ago |
sunyuchao
|
f40304968b
|
修改错误提示
|
3 years ago |
|
zxc
|
6a9c60d8ef
|
错误信息行号
|
3 years ago |
|
wangxianzhang
|
9530f597df
|
解决"查询客户议题项目的分类信息以及递归查询二级分类信息"的类型转换异常
|
3 years ago |
|
jianjun
|
a337a0ab34
|
Revert "楼栋房屋小区排序"
This reverts commit f71ea002
|
3 years ago |
|
jianjun
|
f71ea002bb
|
楼栋房屋小区排序
|
3 years ago |
|
sunyuchao
|
c85ca81445
|
..
|
3 years ago |
yinzuomei
|
50fe78f58b
|
人员图谱查询添加status=0
|
3 years ago |
|
yinzuomei
|
345e2e7a9f
|
bug#2803,修改房屋名后社区查询和居民信息列表展示
|
3 years ago |
|
zhaoqifeng
|
6f7fc3ce5c
|
Merge branch 'dev_costumer_init' into dev
|
3 years ago |
|
jianjun
|
c6af9dc7f6
|
dev合并下来
|
3 years ago |
|
yinzuomei
|
ed1e768732
|
bug#2803,修改房屋名后社区查询和居民信息列表展示
|
3 years ago |
|
jianjun
|
0fbb925b63
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
3 years ago |
|
wangxianzhang
|
7b61020ac6
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
zxc
|
4a70fab897
|
房屋导入
|
3 years ago |
|
jianjun
|
15bfc86987
|
添加公司私服地址 及发布配置
|
3 years ago |
|
jianjun
|
4b1f3633b3
|
Merge remote-tracking branch 'origin/dev' into dev
|
3 years ago |
|
jianjun
|
09f8f47bb3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
3 years ago |
|
jianjun
|
5509da011a
|
错误信息
|
3 years ago |
|
jianjun
|
9a2e8b31f8
|
修改单元数bug
|
3 years ago |
|
zhaoqifeng
|
9099476b61
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
sunyuchao
|
87815a3c75
|
Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
|
3 years ago |
|
sunyuchao
|
88aa2df22a
|
改来改去
|
3 years ago |
|
yinzuomei
|
973358befb
|
2行程上报
|
3 years ago |
|
yinzuomei
|
59635d54ee
|
有重点区域行程
|
3 years ago |
|
zhaoqifeng
|
a20562d78b
|
楼栋编辑单元数时，从头开始新增单元，如果原先已存在，则略过
|
3 years ago |
|
yinzuomei
|
da43e67353
|
Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
|
3 years ago |
|
yinzuomei
|
555bd39d1a
|
有重点区域行程
|
3 years ago |
|
jianjun
|
77624199ac
|
Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
|
3 years ago |
|
jianjun
|
b50690c8cd
|
注解没用
|
3 years ago |
|
yinzuomei
|
d36dc41c8a
|
feign引用了
|
3 years ago |
|
jianjun
|
1c029afe8f
|
删除无用的
|
3 years ago |
|
jianjun
|
2433ffe780
|
删除无用的
|
3 years ago |
|
jianjun
|
818ed7eaea
|
Merge remote-tracking branch 'origin/dev_optimize' into dev_optimize
|
3 years ago |
|
jianjun
|
768664bb95
|
房屋导出再次调整
|
3 years ago |
|
zxc
|
d29939299b
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
3 years ago |
|
zxc
|
23fecfa3a6
|
错误信息具体化
|
3 years ago |
|
yinzuomei
|
01cc1692ab
|
楼宇-》楼栋
|
3 years ago |
