audit

contracts/ytVault/YTAssetVault.sol

@@ -201,12 +201,7 @@ contract YTAssetVault is
             revert HardCapExceeded();
         }
         
-<<<<<<< HEAD
-        IERC20(usdcAddress).safeTransferFrom(msg.sender, address(this), _usdcAmount);
-=======
-        // 转入USDC
         IERC20(usdcAddress).transferFrom(msg.sender, address(this), _usdcAmount);
->>>>>>> usdc
         
         _mint(msg.sender, ytAmount);
         
@@ -382,12 +377,7 @@ contract YTAssetVault is
             managedAssets -= _amount;
         }
         
-<<<<<<< HEAD
-        IERC20(usdcAddress).safeTransferFrom(msg.sender, address(this), _amount);
-=======
-        // 从manager转入USDC到合约
         IERC20(usdcAddress).transferFrom(msg.sender, address(this), _amount);
->>>>>>> usdc
         
         emit AssetsDeposited(_amount);
     }