修改备注

lift-ud-service/src/main/java/cn/com/ty/lift/ud/dataBank/controller/LiftBrandController.java

@@ -72,7 +72,7 @@ public class LiftBrandController extends BaseController<LiftBrandEntity, LiftBra
     @ApiOperation(value = "修改")
     public RestResponse update(@RequestBody LiftBrandEntity request) {
         List<LiftBrandEntity> byName = liftBrandService.getByName(request.getName());
-        if (!byName.isEmpty()) {
+        if (byName.size()>1) {
             return RestResponse.fail("品牌名重复");
         }
         LiftBrandEntity byId = getService().getById(request.getId());

lift-ud-service/src/main/java/cn/com/ty/lift/ud/pay/controller/AlipayController.java

@@ -566,7 +566,7 @@ public class AlipayController {
                 entity.setFlowNum(alipayFundTrans.getPayFundOrderId());
                 entity.setType(2);// '交易类型 1：支出、2：收入
                 entity.setBusinessType(6); // 业务类型：如：2 打赏，3 充值，1 充值会员 4服务费、5提现、6提现失败退款
-                entity.setDescr("用户提现失败，退款");
+                entity.setDescr("提现失败，金额已返还至钱包");
                 entity.setBalance(user.getBalance().add(rechargeAmount));
                 userBillService.save(entity);
             }