Merge remote-tracking branch 'origin/master'

puzhibing

2024-01-03 168d852672f8f671a01d6f0f053349d0d321ec7c

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