Merge remote-tracking branch 'origin/dev' into dev

pmapi/src/main/java/com/ningdatech/pmapi/expert/model/enumeration/ReviewTemplateTypeEnum.java

@@ -23,8 +23,9 @@ public enum ReviewTemplateTypeEnum {
 
     ACCEPTANCE_SCHEME_REVIEW("验收方案评审", 3),
 
-    DEPT_JOIN_REVIEW("部门联审", 4);
+    DEPT_JOIN_REVIEW("部门联审", 4),
 
+    FAIRNESS_REVIEW("公平性审查", 5);
 
     private final String value;
     private final Integer code;

pmapi/src/main/java/com/ningdatech/pmapi/staging/enums/MsgTypeEnum.java

@@ -9,6 +9,7 @@ import java.util.Objects;
 
 /**
  * 消息类型枚举
+ *
  * @author CMM
  * @since 2023/02/28 17:34
  */
@@ -17,38 +18,35 @@ import java.util.Objects;
 @NoArgsConstructor
 public enum MsgTypeEnum {
     /**
-     * 消息类型
-     */
-    /**
      * 项目待审核
      */
-    PROJECT_REVIEW(1,"项目审核"),
+    PROJECT_REVIEW(1, "项目审核"),
     /**
      * 预警提醒
      */
-    WARING(2,"预警提醒"),
+    WARING(2, "预警提醒"),
     /**
      * 专家评审
      */
-    EXPERT_REVIEW(3,"专家评审"),
+    EXPERT_REVIEW(3, "专家评审"),
     /**
      * 评审会议
      */
-    REVIEW_MEETING(4,"评审会议"),
+    REVIEW_MEETING(4, "评审会议"),
     /**
      * 项目审核被退回
      */
-    PROJECT_REVIEW_BACK(5,"项目审核"),
+    PROJECT_REVIEW_BACK(5, "项目审核"),
     /**
      * 项目审核通过
      */
-    PROJECT_REVIEW_PASS(6,"项目审核"),
+    PROJECT_REVIEW_PASS(6, "项目审核"),
     /**
      * 项目审核驳回
      */
-    PROJECT_REVIEW_REJECT(7,"项目审核"),
+    PROJECT_REVIEW_REJECT(7, "项目审核"),
 
-    PROJECT_REVIEW_CC(8,"项目抄送");
+    PROJECT_REVIEW_CC(8, "项目抄送");
 
     private Integer code;
     private String desc;