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

puzhibing

2024-03-01 e0ec0a20cb943b4ee92c45b64f02b007a003b0ba

 cloud-server-course/src/main/java/com/dsh/course/model/dto/DiscountJsonDto.java

@@ -5,7 +5,7 @@
import lombok.Data;

/**
 *  折扣类型json字符串封装
 * 折扣类型json字符串封装
 */

@Data