Merge remote-tracking branch 'origin/master'

nickchange

2023-11-15 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83

 cloud-server-course/src/main/java/com/dsh/course/feignclient/activity/model/Coupon.java

@@ -112,4 +112,7 @@
     */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date insertTime;


    private String timePeriod;
}