Merge remote-tracking branch 'origin/dev' into dev

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/CommonInfoBiz.java

@@ -55,7 +55,7 @@ public class CommonInfoBiz extends BaseBiz<CommonInfoMapper,CommonInfo> {
 	 */
 	public List<CommonInfo> getByType(Integer type) {
 		Example example = new Example(CommonInfo.class);
-		example.createCriteria().andEqualTo("type", type).andEqualTo("isDel", 0);
+		example.createCriteria().andEqualTo("type", type).andEqualTo("isDel", 0).andEqualTo("status", 1);
 		example.orderBy("rank");
 		return mapper.selectByExample(example);
 	}