Merge branch 'dev'

src/main/java/com/izouma/nineth/service/AuctionOrderService.java

@@ -532,8 +532,8 @@ public class AuctionOrderService {
                         //改回资产状态
                         Asset asset = assetRepo.findById(act.getAssetId())
                                 .orElseThrow(new BusinessException("资产不存在"));
-                        asset.setStatus(AssetStatus.NORMAL);
-                        assetRepo.save(asset);
+//                        asset.setStatus(AssetStatus.NORMAL);
+//                        assetRepo.save(asset);
                     }
 
                     //退其余保证金