Merge remote-tracking branch 'origin/master'

nickchange

2023-10-16 6593a67fdfb688c70365b419c0e9658c690524b5

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