Merge branch 'develop'

backend-core/src/main/java/cn/kdan/pdf/backend/core/service/impl/MemberServiceImpl.java

@@ -311,13 +311,13 @@ public class MemberServiceImpl implements MemberService {
         Map<Integer, Pricings> pricingMap = getPricingMap();
         Map<Integer, SetPricings> setPricingMap = getSetPricingMap();
         for (Subscriptions subscription : subscriptionsList) {
-            if (subscription.getTargetType().equals(CommonEnum.SubscriptionTypeEnum.PRICING.value())) {
+            if (CommonEnum.SubscriptionTypeEnum.PRICING.value().equals(subscription.getTargetType())) {
                 SubPricing subPricing = new SubPricing();
                 BeanUtils.copyProperties(subscription, subPricing);
                 subPricing.setPricings(pricingMap.get(subscription.getTargetId()));
                 subPricing.setStartDate(subscription.getCreatedAt());
                 subPricingList.add(subPricing);
-            } else if (subscription.getTargetType().equals(CommonEnum.SubscriptionTypeEnum.SET_PRICING.value())) {
+            } else if (CommonEnum.SubscriptionTypeEnum.SET_PRICING.value().equals(subscription.getTargetType())) {
                 // 不把targetId为1的显示在界面
                 if(1 != subscription.getTargetId()) {
                     SubSetPricing subSetPricing = new SubSetPricing();