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

maven

14 小时以前 f4e70436bb93ab6cc7e2b8c27afa9a5978371855

 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;

}