yinzuomei
|
81e7688a1f
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp
|
5 years ago |
zxc
|
bb94ed8733
|
行政地区编码查询
|
5 years ago |
wangchao
|
b29e29c113
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
zhaoqifeng
|
3cda962e3a
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point
|
5 years ago |
|
zhaoqifeng
|
229002c1ad
|
话题语音
|
5 years ago |
|
wangchao
|
aa2763ed08
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_voice_share_point
|
5 years ago |
|
wangchao
|
5323ce3a50
|
不再填充空白话题内容
|
5 years ago |
|
zhaoqifeng
|
4065d61440
|
Merge branch 'dev_voice_share_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
3f77e97de3
|
话题语音审核结果查询定时任务修改
|
5 years ago |
|
zhaoqifeng
|
cfd19fe41c
|
Merge branch 'dev_voice_share_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
33dc826ce4
|
话题语音审核结果查询定时任务修改
|
5 years ago |
|
zhaoqifeng
|
1cd400a1ce
|
话题语音审核结果查询定时任务修改
|
5 years ago |
|
wangchao
|
3d58e60359
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
4ffcd329eb
|
查询话题列表时，将空白的语音内容替换成“语音话题”；查询话题详情时，查询图片附件的条件要加上附件类型
|
5 years ago |
|
zxc
|
62a9ac2520
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp
# Conflicts:
# epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java
|
5 years ago |
|
zxc
|
c0b9a187c3
|
行政地区编码查询
|
5 years ago |
sunyuchao
|
0d3e814a04
|
Merge branches 'dev' and 'dev_temp' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_temp
|
5 years ago |
|
sunyuchao
|
2f06d8d11d
|
Merge branch 'dev_journal' into dev
|
5 years ago |
|
sunyuchao
|
c5894f8312
|
降低日志级别
|
5 years ago |
|
yinzuomei
|
72811583ae
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
|
yinzuomei
|
67f1806a14
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
yinzuomei
|
3094609b8d
|
getAgencyAreaInfoByBizType修改
|
5 years ago |
|
yinzuomei
|
69263c91a6
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev
|
5 years ago |
|
yinzuomei
|
f8f89d5584
|
Merge remote-tracking branch 'origin/dev_bugfix' into dev_temp
|
5 years ago |
zhangyongzhangyong
|
697eb945fb
|
基层党员-指标月度趋势 接口修改，逻辑为：查询前12个月的数据
|
5 years ago |
|
zhangyongzhangyong
|
ae48a72760
|
追加提交：缺失的月份，补0处理。
|
5 years ago |
|
sunyuchao
|
c04e8b561e
|
Merge branch 'dev_thirdplatform' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
zxc
|
64ef3715d6
|
行政地区编码查询
|
5 years ago |
|
sunyuchao
|
682a8b0acd
|
调整居民端token添加客户Id
|
5 years ago |
|
zhangyongzhangyong
|
672a5041c6
|
基层组织/基层治理 指标，接口修改： 如果传了monthId，返回的数据是截止到当前monthId的近12月，
|
5 years ago |
|
zxc
|
7ac6155b98
|
行政地区编码查询
|
5 years ago |
|
sunyuchao
|
321a365b1d
|
Merge branch 'dev_project_branch' into dev_temp
|
5 years ago |
|
sunyuchao
|
f6bffa9a7c
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
zxc
|
15defc2558
|
sql修改
|
5 years ago |
|
sunyuchao
|
279d2e6919
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
sunyuchao
|
241392bf3b
|
居民热议-已转项目列表排序问题
|
5 years ago |
|
zxc
|
e588e8b193
|
新表对应生成文件上传
|
5 years ago |
wxz
|
7bd7795363
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
|
wxz
|
54ef02d917
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
|
zxc
|
99b13395a4
|
生产地址修改
|
5 years ago |
|
sunyuchao
|
3f93adb75c
|
少包
|
5 years ago |
|
sunyuchao
|
ce79ec7ec0
|
Merge branch 'dev_graceful_shutdown' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
wxz
|
0acb7dd8fb
|
Merge remote-tracking branch 'origin/dev_graceful_shutdown' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml
|
5 years ago |
|
sunyuchao
|
5ba1f09ff2
|
Merge branch 'dev_project_branch' into dev
|
5 years ago |
liushaowen
|
b7003fa52e
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
|
liushaowen
|
57f48ed6a6
|
订阅消息4
|
5 years ago |
|
liushaowen
|
74c41fb6b7
|
订阅消息3
|
5 years ago |
|
zxc
|
e771f12366
|
Merge remote-tracking branch 'origin/dev_project_branch' into dev_temp
|
5 years ago |
|
zxc
|
8e7277bdc0
|
已转项目修改排序
|
5 years ago |
|
liushaowen
|
00e99bc55a
|
Merge branch 'dev_mess_party' into dev_temp
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
|
5 years ago |
