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

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 src/main/java/com/ruoyi/procurementrecord/dto/Details.java

@@ -10,7 +10,11 @@
 */
@Data
public class Details {
    private Integer id;
    private BigDecimal inboundQuantity;
    private BigDecimal warnNum;
    private Integer id;  // 台账产品id
    private BigDecimal inboundQuantity;  // 入库数量
    private BigDecimal warnNum;  // 预警数量（采购入库才有）
    //单价
    private BigDecimal unitPrice;
    private BigDecimal totalPrice;
    private Long productModelId; // 基础产品id
}