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

无关风月

9 天以前 4f5d220cd175b1cb48c6fc91cb02cb12f6114746

 cloud-server-other/src/main/java/com/dsh/other/entity/CourseCounsum.java

@@ -24,7 +24,7 @@
    String reason;
    @TableField("paymentId")
    Long paymentId;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    @TableField("insertTime")
    Date insertTime;
    @TableField("appUserId")