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

cash-common/cash-common-service/src/main/java/com/czg/market/service/MkShopConsumeDiscountRecordService.java

@@ -28,7 +28,6 @@ public interface MkShopConsumeDiscountRecordService extends IService<MkShopConsu
      * @param shopUserId 店铺用户id
      * @param orderId 订单id
      * @param amount 减免金额
-     * @return 是否成功
      */
-    boolean useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
+    void useDiscount(Long recordId, Long shopUserId, Long orderId, BigDecimal amount);
 }