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

puzhibing

2024-06-14 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb

 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;
}