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

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/controller/SupplierController.java

@@ -1,6 +1,7 @@
 package org.dromara.dataManagement.controller;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
@@ -23,6 +24,7 @@ import java.util.HashMap;
 import java.util.List;
 
 
+@SaIgnore
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/dataManagement/supplier")

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/Supplier.java

@@ -1,5 +1,6 @@
 package org.dromara.dataManagement.domain;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -13,6 +14,7 @@ public class Supplier extends TenantEntity {
     /**
      * 主键ID
      */
+    @TableId("id")
     private int id;
 
     /**

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SupplierExcelVo.java

@@ -12,6 +12,11 @@ import java.io.Serializable;
 @AutoMapper(target = Supplier.class)
 public class SupplierExcelVo implements Serializable {
 
+    /**
+     * 主键Id
+     */
+    private int id;
+
     /**
      * 供应商类别
      */

ruoyi-modules/ruoyi-dataManagement/src/main/java/org/dromara/dataManagement/domain/vo/SupplierVo.java

@@ -13,6 +13,11 @@ import org.dromara.dataManagement.domain.Supplier;
 @AutoMapper(target = Supplier.class)
 public class SupplierVo extends BaseEntity {
 
+    /**
+     * id
+     */
+    private int id;
+
     /**
      * 供应商类别
      */