Merge branch 'dev/feat/partner1.6_20231226' into pre

2023-12-19 14:39:53 +08:00
parent fe42d45ec6 4a115ba80f
commit 62dd1580d0
14 changed files with 204 additions and 12 deletions
--- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java
+++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyExhibitionDO.java
@@ -35,6 +35,9 @@ public class HyExhibitionDO implements Serializable {
    @ApiModelProperty("举办日期")
    private Date startDate;

+    @ApiModelProperty("举办日期str")
+    private String startDateStr;
+
    @ApiModelProperty("举办地点")
    private String location;