Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

science-admin/src/main/java/com/yiboshi/science/enumeration/CommonEnum.java

@@ -60,8 +60,8 @@ public class CommonEnum {
     }
 
     public enum projType implements INumberEnum {
-        num(1, "内蒙古自治区卫生健康领域科技计划项目"),
-        key(2, "内蒙古自治区首府地区公立医院高水平临床专科建设科技项目");
+        num(1, "卫生健康领域科技计划项目"),
+        key(2, "公立医院高水平临床专科建设科技项目");
 
         projType(int number, String description) {
             this.code = number;

science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java

@@ -367,27 +367,29 @@ public class ComProjectDTO extends BaseDTO {
     @ApiModelProperty(value = "专业", position = 8)
     private String specName;
 
-    /** 成果形式 */
-    // private List<ComProjectResultsDTO> results;
-    private List<String> results;
-    /** 项目组成员 */
-    private List<ComProjectMembersDTO> members;
     /** 合作单位 */
     private List<ComProjectCooperativeUnitsDTO> cooperativeUnits;
-    /** 项目安排及阶段目标 */
-    private List<ComProjectStageGoalDTO> stageGoals;
-    /** 项目经费构成表   */
-    private List<ComProjectFundCompositionDTO> fundCompositions;
+    /** 项目组成员 */
+    private List<ComProjectMembersDTO> members;
     /** 经费表 */
     private List<ComProjectBudgetDTO> budget;
+    /** 项目经费构成表   */
+    private List<ComProjectFundCompositionDTO> fundCompositions;
+    /** 设备仪器经费表 */
+    private List<ComProjectEquipmentDTO> equipments;
     /** 项目课颖设置表 */
     private List<ComProjectSubDTO> projectSubList;
     /** 单位科研项目及资金管理制度表 */
     private List<ComProjectManagementRuleDTO> managementRuleList;
-    /** 设备仪器经费表 */
-    private List<ComProjectEquipmentDTO> equipments;
     /** 附件列表 */
     private List<ComFileDTO> fileList;
+
     /** 审核列表 */
     private List<ComProjectAuditNoteDTO> auditList;
+    /** 项目安排及阶段目标 */
+    private List<ComProjectStageGoalDTO> stageGoals;
+    /** 成果形式 */
+    // private List<ComProjectResultsDTO> results;
+    private List<String> results;
+
 }
\ No newline at end of file