zxc
|
3cae6d4936
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
zxc
|
e216085dcc
|
议题分享
|
5 years ago |
sunyuchao
|
feebea78ff
|
Merge branch 'dev_mess_party' into dev_temp
|
5 years ago |
liushaowen
|
963ca28550
|
订阅消息bug
|
5 years ago |
|
sunyuchao
|
56f9a3c0fa
|
脚本调整
|
5 years ago |
wangchao
|
9acc689619
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
79fadc6c22
|
入组申请的文案调整 flyway添加字段 issue库
|
5 years ago |
zhaoqifeng
|
58eb35b339
|
Merge branch 'dev_voice_share_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
5566a9a137
|
话题列表，自动审核修改
|
5 years ago |
|
wangchao
|
81405590d5
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
95a1ee5082
|
查询话题详情和图片时加上附件类型条件为image
|
5 years ago |
|
wangchao
|
153fb4e88c
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
wangchao
|
f504dfd1d1
|
修改默认积分模板的积分上限描述
|
5 years ago |
|
wangchao
|
f29b16a2c7
|
转项目发送积分修改
|
5 years ago |
|
wangchao
|
51a283bf5c
|
Merge remote-tracking branch 'origin/dev_temp' into dev_temp
|
5 years ago |
|
wangchao
|
05cffc9aa5
|
Merge remote-tracking branch 'origin/dev_voice_share_point' into dev_temp
|
5 years ago |
|
sunyuchao
|
afcdfb5942
|
Merge branch 'dev_bug_syc' into dev_temp
|
5 years ago |
|
wangchao
|
f8674741b1
|
修改积分文案 sql脚本修改积分规则模板
|
5 years ago |
|
sunyuchao
|
7c2c906598
|
陌生人导览-自动定位获取网格参数校验问题
|
5 years ago |
yinzuomei
|
81e7688a1f
|
Merge remote-tracking branch 'origin/dev_areacode_dict' into dev_temp
|
5 years ago |
|
yinzuomei
|
320ddd3c22
|
selectBranchDataByTypeAndTimeZone SQL添加MEET_CATEGORY_NAME IS NOT NULL
|
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 |
