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

liyong

9 天以前 56f0cc7293f0672ab5291a56ac9aea7b8fd0bf28

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;
}