Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessInfo.java

@@ -114,7 +114,7 @@ public class BusinessInfo extends BaseEntity
     private String customerId;
 
     /** 项目状态 */
-    @Excel(name = "项目状态")
+    @Excel(name = "项目状态(0.储备中1.跟进中2.已合作)")
     private Integer status;
 
     /** 评标办法 */

dsk-system/src/main/java/com/dsk/system/domain/vo/BusinessBrowseVo.java

@@ -32,6 +32,11 @@ public class BusinessBrowseVo {
      */
     private String projectCategory;
 
+    /**
+     * 项目状态(0.储备中1.跟进中2.已合作)
+     */
+    private Integer status;
+
     /**
      * 投资估算
      */