Merge branch 'shelf_status' into dev

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

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

@@ -2,6 +2,7 @@ package com.cyksj.model.views;
 
 import com.cyksj.model.entity.HomeManagementConfig;
 import com.ejlchina.searcher.bean.DbField;
+import com.ejlchina.searcher.bean.DbIgnore;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Getter;
 import lombok.Setter;
@@ -49,11 +50,14 @@ public class HomeManagementConfigView {
 	@DbField("hc.status")
 	private Boolean status;
 
-	@DbField("select count(*) from home_management_config_user_click_record hcr where hcr.config_id = hc.id")
+	@DbIgnore
 	private Integer click;
 
-	@DbField("select count(*) from home_management_config_order_record hor left join order_don o on o.id = hor.order_id where o.status not in ('close','noPayment')")
-	private Integer orderNum;
+	@DbField("hc.pre_status")
+	private Boolean preStatus;
+
+	@DbField("hc.time")
+	private Long time;
 
 	@DbField("hc.created_time")
 	private Date createdTime;

netflix-web/src/main/java/com/cyksj/web/controller/manage/home/HomeManageConfigController.java

@@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Set;
 
-/*
+/** admin/首页管理/首页配置管理
  *项目名: netflix
  *文件名: HomeManageConfigController
  *创建者: JavaZou