Merge remote-tracking branch 'origin/master'

无关风月

1 天以前 27d8f8fbb2e02be63338b80f808969faa35adac0

 ruoyi-system/src/main/java/com/ruoyi/system/service/OaApprovalApplicationPurchaseService.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.system.dto.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.dto.asset.OaApprovalApplicationPurchaseDTO;
import com.ruoyi.system.model.OaApprovalApplicationPurchase;

/**