Merge branch 'jtwy' into dev_New

zss

16 小时以前 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

 src/main/java/com/ruoyi/CodeGenerator.java

@@ -89,6 +89,8 @@
                            .mapperBuilder()
                            .enableFileOverride() // 覆盖已生成Mapper文件
                            .enableBaseResultMap() // 自动生成resultMap
                            .mapperAnnotation(org.apache.ibatis.annotations.Mapper.class)

                            // Service 策略配置
                            .serviceBuilder()
                            .formatServiceFileName("%sService") //格式化 service 接口文件名称，%s进行匹配表名，如 UserService