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

puzhibing

2024-02-29 2679571358258ab0470280b9b225d1ba7c3bb585

 cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackageDiscountService.java

@@ -22,7 +22,7 @@

    List<Details> getWeeksBenefitCourse(Integer appUserId, Integer discountType, String lon, String lat);

    ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId,String lat,String lon);
    ExchangeCoursePackageResponse getWeekFreeCourseDetails(Integer coursePackageDiscountId, String lat, String lon);

    List<DiscountList> queryDiscountList(QueryDiscountList queryDiscountList);