wangxianzhang
|
7d8856dfb7
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
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
|
be92c16cfd
|
bug修改
|
4 years ago |
|
jianjun
|
b21fa3c943
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
f4c3a6a88a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
27362b45cb
|
修改：
auth的serviceListChangedListening选项忘记配置到yml中
|
4 years ago |
|
jianjun
|
393ce22f97
|
数据3版 删掉已经执行的sql
|
4 years ago |
|
sunyuchao
|
d333beb9bc
|
组织、部门、网格添加编码、负责人、电话、网格类型字段
|
4 years ago |
|
jianjun
|
b3efd84077
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
b557ce76ce
|
巡查记录
|
4 years ago |
|
wangxianzhang
|
b26621f899
|
1
|
4 years ago |
|
jianjun
|
b9351a262d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
jianjun
|
f2b8ab3ffc
|
巡查记录添加地址设置
|
4 years ago |
|
wangxianzhang
|
ccdbe0818e
|
修改：
1.因为错误的分之合并，将区块链分支合并到了线上分支，暂时屏蔽掉具体处理，只接受参数
|
4 years ago |
|
jianjun
|
ab5f11c2e5
|
Merge remote-tracking branch 'remotes/origin/dev_ic_data' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
aafeb78854
|
Merge branch 'dev_resi_template_download' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
|
wangxianzhang
|
31aa37d650
|
新增：
1.ic居民信息导入所用excel模板下载
|
4 years ago |
|
zxc
|
2efeec31ed
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d8cefaf5de
|
来源网格的，已结案的项目，满意度分数默认80
|
4 years ago |
|
wangxianzhang
|
ca068bdff3
|
Merge branch 'dev' into dev_ic_data
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
08322393ac
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
a406d0e22c
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
