fix: 修改配置文件和部分缺陷

common/common-generator/src/main/resources/vms/server/mapper.vm

@@ -24,7 +24,7 @@ public interface ${originalName}Mapper extends BaseMapper<${originalName}> {
      * @param dto        ${classTitle}查询表单
      * @return ${classTitle}分页结果
      */
-    IPage<${originalName}> selectListByPage(@Param("page") Page<${originalName}> pageParams, @Param("dto") ${originalName}Dto dto);
+    IPage<${originalName}Vo> selectListByPage(@Param("page") Page<${originalName}> pageParams, @Param("dto") ${originalName}Dto dto);
 
     /**
      * 物理删除${classTitle}

common/common-generator/src/main/resources/vms/server/serviceImpl.vm

@@ -34,7 +34,7 @@ public class ${originalName}ServiceImpl extends ServiceImpl<${originalName}Mappe
         IPage<${originalName}Vo> page = baseMapper.selectListByPage(pageParams, dto);
 
         return PageResult.<${originalName}Vo>builder()
-                .list(voList)
+                .list(page.getRecords())
                 .pageNo(page.getCurrent())
                 .pageSize(page.getSize())
                 .total(page.getTotal())

common/common-generator/src/main/resources/vms/web/hook.vm

@@ -51,10 +51,7 @@ export function onAdd() {
 	});
 }
 
-/**
+/** 更新${classTitle} */
- * * 更新${classTitle}
- * @param row
- */
 export function onUpdate(row: any) {
 	addDialog({
 		title: `$leftBrace$t("modify")}$leftBrace$t("${lowercaseName}")}`,

common/common-generator/src/main/resources/vms/web/index.vm

@@ -24,27 +24,18 @@
         await onSearch();
     };
 
-    /**
+    /** 当分页发生变化 */
-     * * 当分页发生变化
-     * @param value
-     */
     const onPageSizeChange = async (value: number) => {
         ${lowercaseName}Store.pagination.pageSize = value;
         await onSearch();
     };
 
-/**
+/** 选择多行 */
- * * 选择多行
- * @param rows
- */
 const onSelectionChange = (rows: Array<any>) => {
     deleteIds.value = rows.map((row: any) => row.id);
 };
 
-    /**
+/** 重置表单 */
-     * 重置表单
-     * @param formEl
-     */
 const resetForm = async (formEl: FormInstance | undefined) => {
         if (!formEl) return;
         formEl.resetFields();

service/src/main/resources/application-dev.yml

@@ -12,15 +12,9 @@ logging:
   file:
     path: "/logs/${spring.application.name}"
 
-mybatis-plus:
+#mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
+#  configuration:
-  global-config:
+#    map-underscore-to-camel-case: true
-    db-config:
-      logic-delete-field: isDeleted
-      logic-delete-value: 1 # 逻辑已删除值
-      logic-not-delete-value: 0 # 逻辑未删除值
-  configuration:
-    map-underscore-to-camel-case: true
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志
 
 bunny:

service/src/main/resources/application-prod.yml

@@ -1,13 +1,9 @@
 server:
   port: 8000
 
-mybatis-plus:
+#mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
+#  configuration:
-  global-config:
+#    map-underscore-to-camel-case: true
-    db-config:
-      logic-delete-field: isDeleted
-  configuration:
-    map-underscore-to-camel-case: true
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志
 
 logging:

service/src/main/resources/application-test.yml

@@ -1,13 +1,10 @@
 server:
   port: 8000
 
-mybatis-plus:
+#mybatis-plus:
-  mapper-locations: classpath:mapper/*.xml
+#  configuration:
-  global-config:
+#    map-underscore-to-camel-case: true
-    db-config:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 查看日志
-      logic-delete-field: isDeleted
-  configuration:
-    map-underscore-to-camel-case: true
 
 logging:
   level:

service/src/main/resources/application.yml

@@ -74,6 +74,16 @@ spring:
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
 
+mybatis-plus:
+  mapper-locations: classpath:mapper/*.xml
+  global-config:
+    db-config:
+      logic-delete-field: isDeleted
+      logic-delete-value: 1 # 逻辑已删除值
+      logic-not-delete-value: 0 # 逻辑未删除值
+  configuration:
+    map-underscore-to-camel-case: true
+
 management:
   endpoints:
     web: