Merge remote-tracking branch 'origin/master'

auto-solution-behaviour/src/main/java/com/solution/system/service/IBehaviortreeService.java

@@ -35,7 +35,6 @@ public interface IBehaviortreeService
 
     /**
      * 新增行为树主
-     * 
      * @param behaviortree 行为树主
      * @return 结果
      */

auto-solution-behaviour/src/main/resources/mapper/system/TreenodeinstanceMapper.xml

@@ -11,8 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="instanceName"    column="instance_name"    />
         <result property="isRoot"    column="is_root"    />
         <result property="preconditionTempleteId"    column="precondition_templete_id"    />
-        <result property="uuid"    column="uuid"    />
+        <result property="nodeValue"    column="node_value"    />
-        <result property="desciption"    column="desciption"    />
+        <result property="isExtern"    column="is_extern"    />
     </resultMap>
 
     <delete id="deleteByTreeId">
@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <sql id="selectTreenodeinstanceVo">
-        select id, tree_id, template_id, instance_name, is_root, precondition_templete_id, uuid,desciption from treenodeinstance
+        select id, tree_id, template_id, instance_name, is_root, precondition_templete_id, node_value,is_extern from treenodeinstance
     </sql>
 
     <select id="selectTreenodeinstanceList" parameterType="Treenodeinstance" resultMap="TreenodeinstanceResult">
@@ -49,8 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instanceName != null">instance_name,</if>
             <if test="isRoot != null">is_root,</if>
             <if test="preconditionTempleteId != null">precondition_templete_id,</if>
-            <if test="uuid != null">uuid,</if>
+            <if test="nodeValue != null">node_value,</if>
-            <if test="desciption != null">desciption,</if>
+            <if test="isExtern != null">is_extern,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="treeId != null">#{treeId},</if>
@@ -58,8 +58,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instanceName != null">#{instanceName},</if>
             <if test="isRoot != null">#{isRoot},</if>
             <if test="preconditionTempleteId != null">#{preconditionTempleteId},</if>
-            <if test="uuid != null">#{uuid},</if>
+            <if test="nodeValue != null">#{node_value},</if>
-            <if test="desciption != null">#{desciption},</if>
+            <if test="isExtern != null">#{is_extern},</if>
          </trim>
     </insert>
 
@@ -71,8 +71,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instanceName != null">instance_name = #{instanceName},</if>
             <if test="isRoot != null">is_root = #{isRoot},</if>
             <if test="preconditionTempleteId != null">precondition_templete_id = #{preconditionTempleteId},</if>
-            <if test="uuid != null">uuid = #{uuid},</if>
+            <if test="nodeValue != null">#{node_value},</if>
-            <if test="desciption != null">desciption = #{desciption},</if>
+            <if test="isExtern != null">#{is_extern},</if>
         </trim>
         where id = #{id}
     </update>