zhaoqifeng
|
e1980289b7
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
jianjun
|
8bcb383c47
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_optimize
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
3 years ago |
|
zhaoqifeng
|
7f512791ca
|
房屋列表返回房屋状态
|
3 years ago |
|
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
|
bd4c735396
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
|
zhaoqifeng
|
889c52ffe9
|
一个房屋下只有一个户主
|
3 years ago |
wangxianzhang
|
5f97fb6549
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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
|
2de113af08
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
639af5c1f5
|
-
|
3 years ago |
|
zhaoqifeng
|
b128661d32
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
6d0e551157
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
zhaoqifeng
|
114d901ad0
|
项目统计检测sql修改
|
3 years ago |
|
wangxianzhang
|
cfa10fa445
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
4bc3710435
|
改造【核酸检测导入】【居民信息导入】【疫苗接种导入】的importTask传输，封装了工具类，减少代码。调整FileItem临时文件的一些代码
|
3 years ago |
zxc
|
2c83ae8a20
|
Merge remote-tracking branch 'origin/dev_optimize' into develop
|
3 years ago |
|
zxc
|
56303cb484
|
房屋信息
|
3 years ago |
|
zhaoqifeng
|
0c98c87616
|
Merge branch 'dev_bugfix_ljj' into dev
|
3 years ago |
|
wangxianzhang
|
c2885ac1ae
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
wangxianzhang
|
329c37c057
|
导入时增加IS_TENANT/IS_FLOATING的默认值
|
3 years ago |
|
zhaoqifeng
|
780e2d8209
|
Merge branch 'dev_bugfix_ljj' into develop
|
3 years ago |
|
zhaoqifeng
|
dc261c2f9f
|
与房主关系是本人的，为房主
|
3 years ago |
|
wangxianzhang
|
d719d15f63
|
新增：importTask接口对应的工具类ImportTaskUtils，用起来更清爽
|
3 years ago |
|
jianjun
|
7e5201f7a5
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
|
jianjun
|
d843d7622e
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
7755de11f6
|
下载模板代码调整
|
3 years ago |
sunyuchao
|
3eaec6675e
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
|
sunyuchao
|
f40304968b
|
修改错误提示
|
3 years ago |
|
zxc
|
6f1439629f
|
Merge remote-tracking branch 'origin/dev_optimize' into develop
|
3 years ago |
|
zxc
|
6a9c60d8ef
|
错误信息行号
|
3 years ago |
|
wangxianzhang
|
a58838f014
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
ac2785fcb6
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
9530f597df
|
解决"查询客户议题项目的分类信息以及递归查询二级分类信息"的类型转换异常
|
3 years ago |
|
jianjun
|
a337a0ab34
|
Revert "楼栋房屋小区排序"
This reverts commit f71ea002
|
3 years ago |
|
jianjun
|
e4195047df
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
|
jianjun
|
9c562db406
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
3 years ago |
|
jianjun
|
f71ea002bb
|
楼栋房屋小区排序
|
3 years ago |
YUJT
|
a7317f315b
|
Merge branch 'dev_plugin_power_base' into develop
|
3 years ago |
|
YUJT
|
dd5a5323a2
|
gateway新增数字底座动力主轴路由
|
3 years ago |
|
sunyuchao
|
990513866f
|
Merge branch 'dev_optimize' into develop
|
3 years ago |
|
sunyuchao
|
c85ca81445
|
..
|
3 years ago |
yinzuomei
|
f6522bf1ad
|
Merge remote-tracking branch 'origin/dev_optimize' into develop
|
3 years ago |
|
yinzuomei
|
50fe78f58b
|
人员图谱查询添加status=0
|
3 years ago |
|
yinzuomei
|
322d5f45a7
|
Merge remote-tracking branch 'origin/dev_optimize' into develop
# 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 |
|
yinzuomei
|
345e2e7a9f
|
bug#2803,修改房屋名后社区查询和居民信息列表展示
|
3 years ago |
|
zhaoqifeng
|
a75e24bca6
|
Merge branch 'dev'
|
3 years ago |
|
zhaoqifeng
|
6f7fc3ce5c
|
Merge branch 'dev_costumer_init' into dev
|
3 years ago |
|
yinzuomei
|
0416c28e68
|
Merge remote-tracking branch 'origin/dev_epidemic_situation' into develop
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
|
3 years ago |
|
jianjun
|
c6af9dc7f6
|
dev合并下来
|
3 years ago |
|
yinzuomei
|
ed1e768732
|
bug#2803,修改房屋名后社区查询和居民信息列表展示
|
3 years ago |
