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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

 cloud-server-activity/src/main/java/com/dsh/activity/model/IntroduceUser.java

@@ -23,6 +23,6 @@
    private Integer userId;
    private String userPhone;
    private Integer introduceRewards;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date registerTime;
}