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

liyong

4 天以前 f5624a59380db70633eebe3612e2d3c703012b41

 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;

}