Merge remote-tracking branch 'origin/master'

liujie

2023-10-31 1c08cdb19aa0531dc77665dbbde052133dff9ceb

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