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

yaowanxin

2 天以前 a0fa5fa2d82f659a4b3e4a285a1f8603cc93ba86

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

@@ -58,6 +58,6 @@

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

}