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

liding

4 天以前 1d915922d8197aa5d5dc3e40e3088d983dd6e141

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
package com.ruoyi.consumables.dto;
 
import com.ruoyi.consumables.pojo.ConsumablesUnInventory;
import lombok.Data;
 
import java.math.BigDecimal;
 
@Data
public class ConsumablesUnInventoryDto  extends ConsumablesUnInventory {
    private String productName;
    private String model;
    private String unit;
 
 
    //入库类型
    private String recordType;
 
    //入库类型对应的id
    private Long recordId;
 
    private BigDecimal unLockedQuantity;
}