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

无关风月

2 天以前 e8f01399a49bb718f184e31d0f6de27c3dc64cef

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

@@ -38,4 +38,5 @@
    private Integer state;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    private Date insertTime;
    private Integer payStatus;
}