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

liyong

昨天 b9d7eb36481c3ac327f85a38dab1cbee1163be40

 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;

}