Commit e65f40a87486150ad1ede9668fdec9b76a645097
Merge branch 'dev'
Showing
2 changed files
with
3 additions
and
0 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| ... | ... | @@ -243,6 +243,8 @@ public class VideosController extends BaseController { |
| 243 | 243 | videos.setSpid_desc("万人同唱献给党-独唱" + "(目击者)"); |
| 244 | 244 | } else if ("34".equals(source1)) { |
| 245 | 245 | videos.setSpid_desc("万人同唱献给党-合唱" + "(目击者)"); |
| 246 | + } else if ("29".equals(source1)) { | |
| 247 | + videos.setSpid_desc("中国故事上太空" + "(目击者)"); | |
| 246 | 248 | } else { |
| 247 | 249 | videos.setSpid_desc(shySites.getName() + "(目击者)"); |
| 248 | 250 | } | ... | ... |
src/main/resources/templates/page/video.html
| ... | ... | @@ -138,6 +138,7 @@ |
| 138 | 138 | <select class="form-control" id="source" name="source"> |
| 139 | 139 | <option value="">全部</option> |
| 140 | 140 | <option value="moment">朋友圈</option> |
| 141 | + <option value="29">中国故事上太空</option> | |
| 141 | 142 | <option value="0">上传目击者视频</option> |
| 142 | 143 | <option value="1">童声共济视频</option> |
| 143 | 144 | <option value="2">全民健身视频</option> | ... | ... |