jianjun
|
79cdd1a2b8
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
|
5 years ago |
zhaoqifeng
|
40bc5d0320
|
项目超期滞留提醒定时任务
|
5 years ago |
zxc
|
23d4e4a8ca
|
项目详情
|
5 years ago |
|
jianjun
|
f4e4299520
|
删除错误包
|
5 years ago |
|
jianjun
|
bc9a7faa60
|
Merge remote-tracking branch 'origin/dev_difficulty_data' into dev_difficulty_data
|
5 years ago |
wangchao
|
62093f1bc7
|
feign注解
|
5 years ago |
|
jianjun
|
c13fcd5484
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev_difficulty_data
# Conflicts:
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/project/ProjectController.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/ProjectService.java
# epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectProcessService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java
|
5 years ago |
|
jianjun
|
4bcfff380f
|
Merge remote-tracking branch 'remotes/origin/master_bugfix' into dev_difficulty_data
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
|
5 years ago |
|
wangchao
|
921c52a10b
|
因为项目业务改造而需要将历史数据补充到新表的逻辑，从data-stats移动到gov-project下
|
5 years ago |
|
zxc
|
ed2739ae60
|
项目详情
|
5 years ago |
|
zxc
|
3007f286f1
|
项目详情
|
5 years ago |
|
jianjun
|
b943131d11
|
本级及下级 乘以权重
|
5 years ago |
|
zxc
|
a5915b1196
|
项目详情
|
5 years ago |
|
zxc
|
328a76a173
|
项目详情
|
5 years ago |
|
jianjun
|
ce6613c174
|
数据中乘以权重
|
5 years ago |
|
wangchao
|
0cc882cc5b
|
项目改造
|
5 years ago |
|
jianjun
|
1625f7969e
|
Merge remote-tracking branch 'remotes/origin/dev_screen_data_2.0' into dev
|
5 years ago |
|
jianjun
|
f0ce88c099
|
区划限制显示
|
5 years ago |
|
jianjun
|
a97838a1d3
|
Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0
|
5 years ago |
|
jianjun
|
c80561d30a
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
4564033dac
|
项目详情
|
5 years ago |
|
jianjun
|
2a3eb25d1f
|
项目详情返回结果调整
|
5 years ago |
|
zxc
|
27dbc20c8a
|
项目详情
|
5 years ago |
|
jianjun
|
fd5796353e
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zxc
|
79c8e0fa32
|
项目详情
|
5 years ago |
|
zhaoqifeng
|
aa33c94803
|
项目超期滞留提醒
|
5 years ago |
|
jianjun
|
ec18ded05c
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zhaoqifeng
|
5a8237f007
|
项目超期滞留提醒
|
5 years ago |
|
jianjun
|
2091c4a771
|
大屏组织插入时 添加是否显示字段 默认为 显示
|
5 years ago |
|
zxc
|
2fccb11d76
|
backDoor修改
|
5 years ago |
|
zxc
|
970757119c
|
项目详情
|
5 years ago |
|
jianjun
|
fd678eddb7
|
微调后门外部调用方法
|
5 years ago |
|
jianjun
|
a94a22dc48
|
微调后门外部调用方法
|
5 years ago |
sunyuchao
|
8ae342ab77
|
Merge branch 'dev_wx_msg' into dev
|
5 years ago |
|
zxc
|
40b8c2a77f
|
项目详情
|
5 years ago |
|
sunyuchao
|
9459b5517e
|
查询小程序消息模板列表接口
|
5 years ago |
liushaowen
|
b69dc2218b
|
注册党员手动认证时将结果发起推送，给申请注册党员的用户推送一条订阅消息；
|
5 years ago |
|
liushaowen
|
190b91969e
|
工作端审核热心居民申请时将审核结果发起推送，给申请热心居民的用户推送一条订阅消息；
|
5 years ago |
|
zxc
|
986cdedb30
|
项目详情
|
5 years ago |
|
liushaowen
|
d588d209de
|
居民端组长审核用户的入组申请时，如果用户订阅了消息（下同），给申请入组的用户推送一条订阅消息；
|
5 years ago |
|
zxc
|
8be82b9346
|
项目详情
|
5 years ago |
|
liushaowen
|
db380a1ef4
|
发送订阅 改为获取templateId
|
5 years ago |
|
liushaowen
|
23ac9fcea7
|
发送订阅消息，删除messageTime字段
|
5 years ago |
|
liushaowen
|
5a9cd46b25
|
发送订阅消息，增加字数限制
|
5 years ago |
|
zxc
|
1538f9af90
|
组织区域查询【智慧社区】
|
5 years ago |
|
liushaowen
|
c7e8cc5d5f
|
发送订阅5
|
5 years ago |
|
sunyuchao
|
c744517468
|
1
|
5 years ago |
|
liushaowen
|
1a89da20c9
|
发送微信订阅 4
|
5 years ago |
|
liushaowen
|
16b2d07c8c
|
发送订阅消息 3
|
5 years ago |
|
jianjun
|
2d24040193
|
计算器调整
|
5 years ago |
