Merge remote-tracking branch 'origin/master'

liujie

2023-10-24 40f362f8c120a94f35e28dcba6e70b5e42c6d599

 cloud-server-account/src/main/java/com/dsh/account/entity/GiftSearchDto.java

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