Commit 2b9c78c2b5e59a78eae64c564a9028c096f4e0d8
Merge branch 'dev'
Showing
2 changed files
with
21 additions
and
0 deletions
src/main/java/com/cnlive/shenhe/controller/VideosController.java
| @@ -257,6 +257,20 @@ public class VideosController extends BaseController { | @@ -257,6 +257,20 @@ public class VideosController extends BaseController { | ||
| 257 | videos.setSpid_desc("绽放夕阳" + "(目击者)"); | 257 | videos.setSpid_desc("绽放夕阳" + "(目击者)"); |
| 258 | } else if ("40".equals(source1)) { | 258 | } else if ("40".equals(source1)) { |
| 259 | videos.setSpid_desc("家乡推介" + "(目击者)"); | 259 | videos.setSpid_desc("家乡推介" + "(目击者)"); |
| 260 | + } else if ("41".equals(source1)) { | ||
| 261 | + videos.setSpid_desc("老体协-柔力球" + "(目击者)"); | ||
| 262 | + } else if ("42".equals(source1)) { | ||
| 263 | + videos.setSpid_desc("老体协-健身球操" + "(目击者)"); | ||
| 264 | + } else if ("43".equals(source1)) { | ||
| 265 | + videos.setSpid_desc("老体协-太极拳" + "(目击者)"); | ||
| 266 | + } else if ("44".equals(source1)) { | ||
| 267 | + videos.setSpid_desc("老体协-持杖健走" + "(目击者)"); | ||
| 268 | + } else if ("45".equals(source1)) { | ||
| 269 | + videos.setSpid_desc("老体协-广场舞" + "(目击者)"); | ||
| 270 | + } else if ("46".equals(source1)) { | ||
| 271 | + videos.setSpid_desc("老体协-健身秧歌（鼓）" + "(目击者)"); | ||
| 272 | + } else if ("47".equals(source1)) { | ||
| 273 | + videos.setSpid_desc("老体协-综合类" + "(目击者)"); | ||
| 260 | } else { | 274 | } else { |
| 261 | videos.setSpid_desc(shySites.getName() + "(目击者)"); | 275 | videos.setSpid_desc(shySites.getName() + "(目击者)"); |
| 262 | } | 276 | } |
src/main/resources/templates/page/video.html
| @@ -171,6 +171,13 @@ | @@ -171,6 +171,13 @@ | ||
| 171 | <option value="38">教学成果展</option> | 171 | <option value="38">教学成果展</option> |
| 172 | <option value="39">绽放夕阳</option> | 172 | <option value="39">绽放夕阳</option> |
| 173 | <option value="40">家乡推介</option> | 173 | <option value="40">家乡推介</option> |
| 174 | + <option value="41">老体协-柔力球</option> | ||
| 175 | + <option value="42">老体协-健身球操</option> | ||
| 176 | + <option value="43">老体协-太极拳</option> | ||
| 177 | + <option value="44">老体协-持杖健走</option> | ||
| 178 | + <option value="45">老体协-广场舞</option> | ||
| 179 | + <option value="46">老体协-健身秧歌（鼓）</option> | ||
| 180 | + <option value="47">老体协-综合类</option> | ||
| 174 | </select> | 181 | </select> |
| 175 | <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> | 182 | <!--<input class="form-control" name="video_priority" type="text" id="video_priority">--> |
| 176 | </div> | 183 | </div> |