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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/MoneyRecentQuery.java

@@ -11,7 +11,7 @@
    @ApiModelProperty("加盟商id")
    private Integer franchId;
    @ApiModelProperty("加盟商名字，查询用")
    private Integer name;
    private String name;
    @ApiModelProperty("1扣款2充值")
    private Integer type;
    @ApiModelProperty("扣款时间1")