Merge branch 'main' into dev

skyouc

2025-02-17 5759945b04971efd8496d7544e6c666861b3c449

 rsf-framework/src/main/resources/templates/react-admin/Controller.txt

@@ -4,14 +4,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.manager.common.utils.ExcelUtil;
import com.vincent.rsf.manager.common.annotation.OperationLog;
import com.vincent.rsf.manager.common.domain.BaseParam;
import com.vincent.rsf.manager.common.domain.KeyValVo;
import com.vincent.rsf.manager.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import @{COMPANYNAME}.entity.@{ENTITYNAME};
import @{COMPANYNAME}.service.@{ENTITYNAME}Service;
import com.vincent.rsf.manager.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,7 +20,6 @@
import java.util.*;

@RestController
@RequestMapping("/api")
public class @{ENTITYNAME}Controller extends BaseController {

    @Autowired