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

zhibing.pu

2024-08-23 1e630a0e74dab5ae9e2704de890bbb16b951ec99

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/vo/WaterVO.java

@@ -18,7 +18,7 @@
    @ApiModelProperty(value = "支付方手机号")
    private String phone;
    @ApiModelProperty(value = "支付金额")
    private BigDecimal money;
    private String money;
    @ApiModelProperty(value = "支付方式")
    private String payType;
    @ApiModelProperty(value = "流水项目")