Merge branch 'dev_New' into dev_宁夏_中盛建材

zss

8 天以前 43113d6b1670530dfb4348836fd491c79f36af0a

 src/main/java/com/ruoyi/sales/pojo/InvoiceRegistrationProduct.java

@@ -54,10 +54,10 @@
    private String invoiceType;

    @ApiModelProperty(value = "开票数")
    private Integer invoiceNum;
    private BigDecimal invoiceNum;

    @ApiModelProperty(value = "未开票数")
    private Integer noInvoiceNum;
    private BigDecimal noInvoiceNum;

    @ApiModelProperty(value = "开票金额")
    private BigDecimal invoiceAmount;
@@ -83,5 +83,5 @@

    @ApiModelProperty(value = "租户ID")
    @TableField(fill = FieldFill.INSERT)
    private Integer tenantId;
    private Long tenantId;
}