Merge remote-tracking branch 'origin/master'

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserFaceController.java

@@ -76,7 +76,7 @@ public class SysUserFaceController {
     @Operation(summary = "新增人脸样本表", description = "新增人脸样本表")
     @SysLog("app新增人脸样本表")
     @PostMapping("/app")
-    @Idempotent(expireTime = 10, info = "正在处理中，请勿重复操作")
+    @Idempotent(expireTime = 3, info = "正在处理中，请勿重复操作")
     public R appSave(@RequestBody SysUserFaceEntity dto) {
         PjcloudUser user = SecurityUtils.getUser();
         dto.setUserId(user.getId());

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/mapper/recharge/WalletRechargeApplyMapper.java

@@ -11,7 +11,6 @@ import com.bsd.pjcloud.wallet.api.dto.recharge.WalletRechargeApplyDto;
 import com.bsd.pjcloud.wallet.api.entity.WalletManageEntity;
 import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeApplyEntity;
 import com.bsd.pjcloud.wallet.api.entity.WalletTypeEntity;
-import com.bsd.pjcloud.wallet.api.entity.recharge.WalletRechargeImportEntity;
 import com.bsd.pjcloud.wallet.api.vo.recharge.WalletRechargeApplyVo;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;