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

无关风月

2 天以前 2b2e8603381d62b5da4a817710b33d583561ff3f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/model/dto/VipRefundDto.java

@@ -14,5 +14,7 @@
    String id;
    // 会员到期时间
    String endTime;
    // 会员到期时间
    String remark;

}