Merge remote-tracking branch 'origin/master'

liujie

2023-10-25 c69e75c9e3560c0a158b2d1bb3a62e5cbc7ed320

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