Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!938

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserPrizeRecoveryController.java

@@ -137,7 +137,7 @@ public class UserPrizeRecoveryController extends BaseApiController {
             exchangePrice = goods.getExchangePrice();
         }
 
-        if (BigDecimal.ZERO.equals(discountRate)) {
+        if (BigDecimal.ZERO.compareTo(discountRate) == 0) {
             return AjaxResult.error("该商品不支持回收");
         }