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 |
|
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 |
|
yinzuomei
|
47559f3715
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
58ef2d14da
|
需求大厅
|
4 years ago |
|
wangxianzhang
|
4a58966f6b
|
Merge branch 'wxz_demand_service_stats' into develop
|
4 years ago |
|
wangxianzhang
|
35d9cd2185
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_demand_service_stats
|
4 years ago |
|
wangxianzhang
|
742282a219
|
修改：
1.志愿者需求服务统计。以网格为维度统计。
2.志愿者分页查询。增加上级agencyId为条件，查询该agencyId下n级所有的志愿者
3.志愿者分布查询。增加agencyId为条件，查询该agencyId下n级所有的志愿者.
4.志愿者需求服务统计结果查询。增加agencyId为条件，查询该agencyId下n级所有的服务统计信息。
|
4 years ago |
zhaoqifeng
|
51154424c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
266d75f719
|
抽取项目数据到screen_project_*
|
4 years ago |
|
sunyuchao
|
a25d159fb2
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
89ca18b91f
|
事件详情返参附件处理
|
4 years ago |
|
zhaoqifeng
|
eb4d2eb6e6
|
议事
|
4 years ago |
|
sunyuchao
|
d47db4ad95
|
加返参
|
4 years ago |
|
sunyuchao
|
38c5cf54e3
|
事件上报增加语音附件、语音附件自动审核任务
|
4 years ago |
|
zhaoqifeng
|
4924db329f
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15122bad11
|
抽取项目数据到screen_project_*
|
4 years ago |
|
yinzuomei
|
f2afb49b12
|
需求大厅
|
4 years ago |
|
jianjun
|
403554b128
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop
|
4 years ago |
|
jianjun
|
fe4ef78001
|
恢复原有的字段
|
4 years ago |
|
jianjun
|
d7e571d9d2
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop
|
4 years ago |
|
jianjun
|
34ca3d902a
|
例行工作 flyway 脚本
|
4 years ago |
|
jianjun
|
abfb1eb13a
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work
|
4 years ago |
|
jianjun
|
97d6b70289
|
例行工作添加接口
|
4 years ago |
|
yinzuomei
|
55881cc082
|
志愿者注册自动注册居民，注释url
|
4 years ago |
|
yinzuomei
|
7343ce18c8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
6c8ee748a0
|
志愿者注册自动注册居民
|
4 years ago |
|
sunyuchao
|
c2f209fc85
|
组织列表加返参
|
4 years ago |
|
jianjun
|
9008ae53a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
69bd99790e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
3f9d3fe330
|
巡查最小上报间隔改为3分钟
|
4 years ago |
|
jianjun
|
3b147341e2
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
6197b70ca1
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
2f916a7fee
|
多一个属性 怕啥
|
4 years ago |
|
jianjun
|
0f973b472d
|
多一个属性 怕啥
|
4 years ago |
