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

mitao

2025-03-31 51f26723bee741bf112c8d0d965d0e2f2974bd04

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

@@ -34,5 +34,9 @@
     * 1 = 会员 2 =非会员
     */
    private Integer type;

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