Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

cp

2024-10-21 33590e66e814b1c2e025e038410ef0006f4f38f7

 zy-asrs-common/src/main/java/com/zy/asrs/common/sys/service/impl/ResourceServiceImpl.java

@@ -2,7 +2,7 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zy.asrs.common.sys.entity.Resource;
import com.zy.asrs.common.sys.dao.ResourceMapper;
import com.zy.asrs.common.sys.mapper.ResourceMapper;
import com.zy.asrs.common.sys.service.ResourceService;
import org.springframework.stereotype.Service;