Merge remote-tracking branch 'origin/main'

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/SysOaWarehouseMasterBo.java

@@ -13,6 +13,7 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 出库单管理业务对象 sys_oa_warehouse_master
@@ -45,6 +46,8 @@ public class SysOaWarehouseMasterBo extends BaseEntity {
     /**
      * 编写日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date signTime;
 
     /**

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaProgressVo.java

@@ -92,6 +92,8 @@ public class OaProgressVo {
 
     private List<OaProgressVo> children;
 
+    private List<OaProgressDetailVo> tasks;
+
     /**
      * 联系人电话
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaProjectVo.java

@@ -230,6 +230,11 @@ public class SysOaProjectVo {
      */
     private Long tradeType;
 
+    /**
+     * 总完成度
+     */
+    private Long progress;
+
     /**
      * 预付款
      */

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/SysOaWarehouseVo.java

@@ -32,7 +32,7 @@ public class SysOaWarehouseVo extends SysOaWarehouse {
      * 序号
      */
     @ExcelProperty(value = "序号")
-    private Long temp;
+    private String temp;
 
 
     /**