Merge branch 'master' into xin

xin

5 days ago 8a7f9301f4b9e6fcd4e1b3014fb8c5d52820e179

 oying-system/src/main/java/com/oying/modules/pc/store/service/StoreService.java

@@ -64,6 +64,8 @@

    boolean updateDeliveryFee(Long storeId, BigDecimal deliveryFee, Long version);

    boolean updatePackagingFee(Long storeId, BigDecimal packagingFee, Long version);

    boolean updateStatus(Long storeId, Integer status, Long version);

    boolean existsByIdAndMerchantId(Long storeId, Long merchantId);