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

zss

昨天 e595c86c223563a178b9bb0d0dcb8b0c3c3771c0

1
2
3
4
5
6
7
8
9
10
11
12
13
package com.ruoyi.warehouse.dto;
 
import com.ruoyi.warehouse.pojo.*;
import lombok.Data;
 
import java.util.List;
 
@Data
public class WarehouseDto extends Warehouse {
 
    private String goodsShelvesName;
    private String category;
}