Merge branch 'bug'

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/NewsController.java

@@ -47,6 +47,7 @@ public class NewsController extends BaseController {
 
 		if (queryInfo.getType() == 2) {
 			queryInfo.setAttribute2(queryInfo.getSubType());
+			queryInfo.setSubType(null);
 		}
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);