Merge remote-tracking branch 'origin/master'

liujie

2023-10-10 cd45ac2fa0097de2fd9bf637fc5a23593be1aef0

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