Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/skillType/controller/SkillTypeController.java

@@ -12,6 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.skillType.entity.SkillType;
 import org.jeecg.modules.skillType.service.ISkillTypeService;
+import org.jeecg.modules.taskSkill.entity.TaskSkillConstant;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -68,7 +69,7 @@ public class SkillTypeController extends JeecgController<SkillType, ISkillTypeSe
 	@PostMapping(value = "/add")
 	public Result<?> add(@RequestBody SkillType skillType) {
 		if (skillType.getSupertypeId() == null){
-			skillType.setSupertypeId("-1");
+			skillType.setSupertypeId(TaskSkillConstant.skill_superType);
 		}
 		skillTypeService.save(skillType);
 		return Result.OK("添加成功！");

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/taskSkill/entity/TaskSkillConstant.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.taskSkill.entity;
+
+/**
+ * @author admin
+ */
+public interface TaskSkillConstant {
+    /**
+     *   任务技能类型的父类型默认值
+     */
+    public final String skill_superType="-1";
+}