Merge branch 'information-27' into dev

netflix-dao/src/main/java/com/cyksj/model/entity/HomeManagementConfig.java

@@ -18,6 +18,9 @@ public class HomeManagementConfig extends BaseEntity{
 
 	private String pic;
 
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
+	private String icon;
+
 	private String url;
 
 	private Long goodsId;

netflix-dao/src/main/java/com/cyksj/model/request/HomeManageConfigReq.java

@@ -21,6 +21,8 @@ public class HomeManageConfigReq {
 
 	private String pic;
 
+	private String icon;
+
 	private String url;
 
 	/**

netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementConfigView.java

@@ -29,6 +29,9 @@ public class HomeManagementConfigView {
 	@DbField("hc.pic")
 	private String pic;
 
+	@DbField("hc.icon")
+	private String icon;
+
 	@DbField("hc.goods_id")
 	private Long goodsId;
 

netflix-dao/src/main/java/com/cyksj/model/views/HomeManagementFrontView.java

@@ -55,6 +55,9 @@ public class HomeManagementFrontView {
 	@DbField("hc.pic")
 	private String pic;
 
+	@DbField("hc.icon")
+	private String icon;
+
 	@DbField("hc.tag")
 	private String tag;
 

netflix-service/src/main/java/com/cyksj/common/service/CropDutyServiceDateService.java

@@ -53,7 +53,7 @@ public class CropDutyServiceDateService {
 		if (holidyDateMap == null) {
 			return null;
 		}
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd");
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/M/d");
 		String nowDate = now.format(formatter);
 
 		List<YhServiceDto> holidayServices = holidyDateMap.get(nowDate);