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

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java

@@ -155,7 +155,7 @@ public class PpPackageServiceImpl extends ServiceImpl<PpPackageMapper, PpPackage
 
         // 如果没有开启操作，直接返回空数据
         Integer promotionSwitch = getPackagePromotionSwitch(shopId);
-        if (SystemConstants.OneZero.ZERO == promotionSwitch) {
+        if (SystemConstants.OneZero.ZERO == promotionSwitch && !isAdmin) {
             log.info("没有开启套餐推广");
             return new Page<>();
         }