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

puzhibing

2024-03-04 135aeb3706b445d6d1a937168a0fe781cf3060a8

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

@@ -8,7 +8,7 @@
@Data
public class IntroduceUserQuery {
    // 介绍有礼id
    private Integer introduceId;
    private Integer activityId;
    // 分享用户姓名
    private String shareUserName;
    // 分享用户i淡化