Merge branch 'master' of csk/kmall-pt into master

kmall-admin/src/main/resources/mybatis/mapper/mk/MkCenterMenuDao.xml

@@ -110,7 +110,7 @@
 		LEFT JOIN mk_center_menu a ON a.id = r.center_menu_id
 		LEFT JOIN mall_store s ON r.store_id = s.id
 		LEFT JOIN third_merchant_biz t ON r.third_merch_sn = t.third_merch_sn
-		WHERE 1=1
+		WHERE 1=1 AND a.is_valid='0'
 		<if test="menuName != null and menuName.trim() != ''">
 			AND menu_name LIKE concat('%',#{menuName},'%')
 		</if>