Merge branch 'tall3' of dd.tall.wiki:ccsens_wiki/ccsenscloud into tall3

common/src/main/java/com/ccsens/common/bean/dto/TaskDto.java

@@ -29,7 +29,7 @@ public class TaskDto {
         @ApiModelProperty("时间基准点 默认当前")
         private Long timeNode = System.currentTimeMillis();
         @ApiModelProperty("时间基准点 默认天")
-        private int timeUnit;
+        private int timeUnit = 4;
     }
 
     @Data
@@ -41,7 +41,7 @@ public class TaskDto {
         @ApiModelProperty("时间基准点 默认当前")
         private Long timeNode = System.currentTimeMillis();
         @ApiModelProperty("时间基准点 默认天")
-        private int timeUnit;
+        private int timeUnit = 4;
         @ApiModelProperty("0向上查找  1向下查找(默认) 下查包含自己，上查不包含")
         private int queryType = 1;
         @ApiModelProperty("查找颗粒度数量 默认3个")

common/src/main/java/com/ccsens/common/bean/vo/ProjectVo.java

@@ -9,13 +9,31 @@ import lombok.Data;
  */
 @Data
 public class ProjectVo {
+
     @Data
     @ApiModel("项目信息")
     public static class ProjectInfo{
-        @ApiModelProperty("项目id")
+        @ApiModelProperty("项目id(任务详情id)")
-        private Long projectId;
+        private Long id;
         @ApiModelProperty("项目名称")
         private String name;
+        @ApiModelProperty("项目描述")
+        private String description;
+        @ApiModelProperty("重复频率")
+        private String cycle;
+        @ApiModelProperty("计划开始时间")
+        private String planStartTime;
+        @ApiModelProperty("计划时长")
+        private String planDuration;
+        @ApiModelProperty("计划结束时间")
+        private String planEndTime;
+        @ApiModelProperty("真实开始时间")
+        private String realStartTime;
+        @ApiModelProperty("真实时长")
+        private String realDuration;
+        @ApiModelProperty("真实结束时间")
+        private String realEndTime;
+
     }
 
     @Data

signin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 server:
   port: 7130
   servlet:
-    context-path:
+    context-path: /v3.0
 spring:
   snowflake:
     datacenterId: 1

signin/src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 server:
   port: 7130
   servlet:
-    context-path: /v1.0
+    context-path: /v3.0
 spring:
   snowflake:
     datacenterId: 1

signin/src/main/resources/application-test.yml

@@ -1,7 +1,7 @@
 server:
   port: 7130
   servlet:
-    context-path: /v1.0
+    context-path: /v3.0
 spring:
   snowflake:
     datacenterId: 1