jianjun
|
e1d047ffa3
|
组织及网格去掉 默认跟组织的中心点
|
4 years ago |
|
jianjun
|
f0c71b4cab
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
jianjun
|
beac655851
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
78043ae8ac
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
4b0264ef65
|
去掉 默认跟组织的中心点
|
4 years ago |
wangxianzhang
|
0db2588a93
|
版本升级
|
4 years ago |
|
wangxianzhang
|
6360128fd2
|
Merge branch 'dev'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
wangxianzhang
|
5efb0bf3e1
|
版本升级
|
4 years ago |
|
jianjun
|
95d41bce74
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
eff02b75da
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
26b8ccbccb
|
Merge remote-tracking branch 'remotes/origin/dev_ic_mp' into develop
|
4 years ago |
|
wangxianzhang
|
026d2f38d8
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
wangxianzhang
|
0bcb12f842
|
修改：
/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数
|
4 years ago |
|
wangxianzhang
|
51a5a02319
|
版本升级
|
4 years ago |
|
wangxianzhang
|
4db520285a
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
a3d299884b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
fbde89c7b7
|
修改楼宇排序 先按创建时间 再按楼宇名称；房屋排序将单元号转为数字排 up
|
4 years ago |
|
jianjun
|
3d95060611
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
yinzuomei
|
080d3a947f
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
afd9b1e6ee
|
pc完成需求调整
|
4 years ago |
|
jianjun
|
3370f8694c
|
Merge remote-tracking branch 'remotes/origin/dev_ic_data' into develop
|
4 years ago |
|
jianjun
|
8f0b81b16d
|
修改楼宇排序 先按创建时间 再按楼宇名称；房屋排序将单元号转为数字排
|
4 years ago |
|
yinzuomei
|
a071fc8dc8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
174f54863f
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
0f30cca68b
|
最近预约、需求分类
|
4 years ago |
|
wangxianzhang
|
e86f65eb31
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
sunyuchao
|
aedc0b639e
|
服务电话查询、未读消息删除
|
4 years ago |
|
jianjun
|
6aba933504
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
14487d3f70
|
左侧树也排一下顺序
|
4 years ago |
|
yinzuomei
|
a2399ec2eb
|
加点注释
|
4 years ago |
|
sunyuchao
|
af75898b9c
|
.
|
4 years ago |
|
jianjun
|
ac2fafdfa3
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
sunyuchao
|
b6971f41fa
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
0094461b77
|
工作端通讯录
|
4 years ago |
|
jianjun
|
e32c245b93
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
21372f6068
|
Merge branch 'dev_ic_data' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
82f7e51d7b
|
小区 楼宇 房屋 排序
小区创建时间
楼宇 漏洞名称
房屋 单元-门牌号
|
4 years ago |
zxc
|
3a83357ae8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
01a7f9332a
|
党群服务中心列表查询修改
|
4 years ago |
|
sunyuchao
|
ab8e163a9d
|
最新直报返参附件类型分为图片和语音
|
4 years ago |
|
yinzuomei
|
d53b89219c
|
评价+取消需求
|
4 years ago |
|
yinzuomei
|
c6cd061e84
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
|
4 years ago |
|
yinzuomei
|
0c146e9570
|
需求表存储需求人的房屋地址
|
4 years ago |
|
yinzuomei
|
78ebf8872c
|
404
|
4 years ago |
|
yinzuomei
|
e1790b2b5d
|
注释
|
4 years ago |
|
yinzuomei
|
91bf84654a
|
bugfix
|
4 years ago |
|
yinzuomei
|
17232934fa
|
bugfix
|
4 years ago |
|
wangxianzhang
|
17df75d84d
|
Merge branch 'wxz_demand_service_stats' into dev_ic_mp
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
sunyuchao
|
b8aba44836
|
【事件】（未处理、处理中、已办结）地图、列表
|
4 years ago |
|
yinzuomei
|
846d90e493
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
# Conflicts:
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/VolunteerInfoEntity.java
# epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/VolunteerInfoServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
