Merge branch 'jtwy' into dev_New

zss

昨天 e435c834aac75f49cf2d1945bd4f849524e8b59c

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

@@ -49,5 +49,5 @@

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