Merge remote-tracking branch 'origin/2.0' into 2.0

无关风月

6 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

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