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

maven

昨天 bb78ea38792502cbff36c9a4486b7b12e1940615

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

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