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

liyong

2026-05-22 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

 src/main/java/com/ruoyi/warehouse/pojo/Warehouse.java

@@ -6,7 +6,7 @@
import java.time.LocalDateTime;
import java.util.Date;

import io.swagger.annotations.ApiModel;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;

/**
@@ -15,7 +15,7 @@
 */
@TableName(value ="warehouse")
@Data
@ApiModel
@Schema
public class Warehouse implements Serializable {
    /**
     *