Merge branch 'master' into smartor_ls_261103

陈昶聿

8 天以前 2867cf7076a584a34e63174cec0a8b89cdd03e4c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/PatArchivetagController.java

@@ -5,7 +5,7 @@

import com.ruoyi.common.annotation.AddOrgId;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.smartor.service.IPatArchivetagService;
import com.ruoyi.patarchive.service.IPatArchivetagService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;