jianjun
|
1f944cf58f
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.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
|
4 years ago |
zhaoqifeng
|
538d97d87d
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
e6017c4465
|
这个代码被删除了 恢复
|
4 years ago |
|
zhaoqifeng
|
022c7acba3
|
list转map key重复
|
4 years ago |
yinzuomei
|
2f5701c220
|
icneighborhood/open/list
|
4 years ago |
|
yinzuomei
|
943000ff25
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
|
4 years ago |
zhangyuan
|
f3f342137e
|
Merge branch 'dev_contract' into dev
|
4 years ago |
|
zhangyuan
|
0e425a33a8
|
增加插入用户以及头像等的逻辑
|
4 years ago |
|
yinzuomei
|
2f12980ec9
|
icneighborhood/open/list
|
4 years ago |
zxc
|
323c9647dc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
4d00ed4028
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
ba2e697158
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
|
4 years ago |
|
zxc
|
b67720aab3
|
em
|
4 years ago |
|
zxc
|
7a9d5a25c8
|
楼栋修改新增修改房屋名字
|
4 years ago |
YUJT
|
f0f742a4e3
|
合并分支并处理冲突
|
4 years ago |
|
YUJT
|
d6a5818d73
|
补充排序
|
4 years ago |
|
jianjun
|
ff2850d132
|
返回code
|
4 years ago |
wangxianzhang
|
3d318fb2d3
|
核酸检测导入增加app，client等的日志
|
4 years ago |
|
YUJT
|
d4f36ec9f7
|
新增接口，查询房屋家庭成员
|
4 years ago |
|
zhaoqifeng
|
90fffb54d6
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
03ba21348f
|
Merge branch 'dev_optimize' into dev
|
4 years ago |
|
zhaoqifeng
|
b2564c7321
|
bug修改
|
4 years ago |
|
zhaoqifeng
|
ce1e388709
|
bug修改
|
4 years ago |
|
zxc
|
6dab1ef92c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
759893a96c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
99b70cd058
|
项目关闭防重复提交
|
4 years ago |
|
jianjun
|
7eeccc2647
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
fc3604a84f
|
获取房屋列表
|
4 years ago |
|
jianjun
|
e9bacc926a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
2f7d151724
|
单元代码合并错误
|
4 years ago |
|
jianjun
|
c8e75b2add
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
43d9adff3b
|
单元设置id
|
4 years ago |
|
jianjun
|
ba801742fe
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
6936a1c444
|
导出bug 未发现改了改
|
4 years ago |
|
zhaoqifeng
|
de00b0536d
|
联建活动添加网格
|
4 years ago |
|
jianjun
|
e772c238df
|
Merge branch 'dev_optimize' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_optimize
|
4 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
|
4 years ago |
|
zhaoqifeng
|
7f512791ca
|
房屋列表返回房屋状态
|
4 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
|
4 years ago |
|
zhaoqifeng
|
889c52ffe9
|
一个房屋下只有一个户主
|
4 years ago |
|
wangxianzhang
|
5f97fb6549
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
b99e059ec4
|
Merge branch 'wxz_temp_file' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
639af5c1f5
|
-
|
4 years ago |
|
zhaoqifeng
|
b128661d32
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
6d0e551157
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
114d901ad0
|
项目统计检测sql修改
|
4 years ago |
|
wangxianzhang
|
4bc3710435
|
改造【核酸检测导入】【居民信息导入】【疫苗接种导入】的importTask传输，封装了工具类，减少代码。调整FileItem临时文件的一些代码
|
4 years ago |
|
zxc
|
56303cb484
|
房屋信息
|
4 years ago |
|
zhaoqifeng
|
0c98c87616
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
wangxianzhang
|
329c37c057
|
导入时增加IS_TENANT/IS_FLOATING的默认值
|
4 years ago |
