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

无关风月

昨天 3044a637a15e09d50ad733fd482c6e64e90df2f9

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Franchisee.java

@@ -94,6 +94,9 @@
    @ApiModelProperty("余额")
    @TableField("balance")
    private BigDecimal balance;
    @ApiModelProperty("操作密码")
    @TableField("payPassword")
    private String payPassword;
    @TableField(exist = false)
    private String siteStr;
}