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

luofl

2025-04-03 a78ac968018e42634cfb37a6a1ef3aa2dd10acc9

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

@@ -7,5 +7,5 @@
public class GiftSearchDto {
    String name;
    String phone;
    Integer id;
    Long id;
}