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 |
sunyuchao
|
15369acced
|
【事件】网格员服务电话
|
4 years ago |
zxc
|
9d6c5dd7f4
|
issue升级
|
4 years ago |
|
zxc
|
94196b7793
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
39c13a0b8c
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev
|
4 years ago |
|
jianjun
|
e9f06b6fd8
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
a6bf321d35
|
去掉还不行 那就返回吧
|
4 years ago |
|
jianjun
|
cf49fdd9e8
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
72769c02b0
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b3307783b9
|
添加例行工作暂存
|
4 years ago |
|
jianjun
|
416640b36d
|
系统字典添加 返回pValue
|
4 years ago |
|
sunyuchao
|
0516be08f9
|
【事件】社区服务热线
|
4 years ago |
wangxianzhang
|
b29af47d56
|
版本升级
|
4 years ago |
|
wangxianzhang
|
453a9e5b3f
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
7d8856dfb7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
66c6094975
|
Merge branch 'dev' into release_temp
|
4 years ago |
|
wangxianzhang
|
5aebe9cee8
|
Merge branch 'dev' into develop
|
4 years ago |
|
wangxianzhang
|
e29db03d3b
|
修改：
1.楼栋管理，楼栋列表排列顺序：按创建时间正序，先添加的在上面，后添加的在下面
|
4 years ago |
yinzuomei
|
0faa464b16
|
queryHouseInfo修改
|
4 years ago |
|
yinzuomei
|
609f2b05dc
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者.
|
4 years ago |
|
wangxianzhang
|
33516045ff
|
Merge branch 'wxz_dim_sync' into release_temp
|
4 years ago |
|
jianjun
|
1e327df41f
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
447035ca0a
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
55f47ba150
|
Merge branch 'wxz_dim_sync' into develop
|
4 years ago |
|
jianjun
|
0eb3a67001
|
系统字典添加 获取树形结构的方法
|
4 years ago |
|
wangxianzhang
|
74b1680c0f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
wangxianzhang
|
ccb95c5c5c
|
新增：
1.同步漏掉的历史grid，agency,department维度到维度表，查漏补缺
|
4 years ago |
|
yinzuomei
|
d66ee30553
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者。放开url
|
4 years ago |
|
yinzuomei
|
9a5d31cda8
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
27dec0dc17
|
pc指派时志愿者列表修改为，当前组织及下级所有志愿者。
|
4 years ago |
|
sunyuchao
|
9f1f762bee
|
组织部门网格新增编辑详情列表入参返参调整
|
4 years ago |
|
yinzuomei
|
8709ecfbe2
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
yinzuomei
|
20372fa35d
|
pc提交需求，修改需求记录需求人的houseId，房屋地址，楼的经纬度，记录发放积分
|
4 years ago |
|
sunyuchao
|
7293ef7680
|
删除已读消息、事件回复立项办结推送站内信
|
4 years ago |
|
jianjun
|
8099cb5e46
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
jianjun
|
204c2bb148
|
Merge branch 'dev_grid_user_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
96e9a3cc37
|
系统字典添加 获取树形结构的方法
|
4 years ago |
|
zxc
|
56927d5e35
|
Merge remote-tracking branch 'origin/dev_ic_data' into develop
|
4 years ago |
|
zxc
|
671d4c77c7
|
党群服务中心修改
|
4 years ago |
|
yinzuomei
|
44dde98632
|
完成+评价记录日志
|
4 years ago |
|
jianjun
|
e003e6c325
|
Merge remote-tracking branch 'remotes/origin/dev_grid_user_work' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
jianjun
|
cc103a434c
|
系统字典添加 父级字段
|
4 years ago |
|
jianjun
|
2d03856f1e
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work
|
4 years ago |
|
sunyuchao
|
d53b46c323
|
null
|
4 years ago |
|
sunyuchao
|
b5300abfc5
|
消息枚举类
|
4 years ago |
|
zxc
|
173ce4a0ef
|
resibuzz优化查询
|
4 years ago |
|
jianjun
|
1b4e14d58c
|
bug修改；及党建声音附件视频上线
|
4 years ago |
