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

云

10 天以前 a7dd93b840bdce4bd0011bc948157f440514a207

 src/main/resources/vm/java/controller.java.vm

@@ -1,7 +1,7 @@
package ${packageName}.controller;



import java.util.List;

import javax.servlet.http.HttpServletResponse;

import jakarta.servlet.http.HttpServletResponse;

import org.springframework.security.access.prepost.PreAuthorize;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.web.bind.annotation.GetMapping;

@@ -53,7 +53,7 @@
    public AjaxResult list(${ClassName} ${className})

    {

        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});

        return AjaxResult.success(list);

        return success(list);

    }

#end



@@ -77,7 +77,7 @@
    @GetMapping(value = "/{${pkColumn.javaField}}")

    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})

    {

        return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));

        return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));

    }



    /**