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

puzhibing

2024-03-11 334fbd5f1a5a4e85c198560bd024211ba4cf99b1

 cloud-server-account/src/main/java/com/dsh/account/mapper/TStudentMapper.java

@@ -31,8 +31,7 @@
    List<GetHistoryDto> getHistory();



    Integer getGiftSelect(@Param("giftSearchDto")GiftSearchDto giftSearchDto);
    Integer getGiftSelect(@Param("giftSearchDto") GiftSearchDto giftSearchDto);

    List<Map<String, Object>> queryCom(@Param("id") Integer id);
}