Merge remote-tracking branch 'origin/master'

smart-system/src/main/resources/mapper/management/MarkerMapper.xml

@@ -46,10 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where marker_id = #{markerId}
     </select>
 
-    <insert id="insertMarker" parameterType="Marker">
+    <insert id="insertMarker" parameterType="Marker" useGeneratedKeys="true" keyProperty="markerId">
         insert into t_marker
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="markerId != null">marker_id,</if>
             <if test="markerName != null">marker_name,</if>
             <if test="markerType != null">marker_type,</if>
             <if test="address != null">address,</if>
@@ -66,7 +65,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="content != null">content,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="markerId != null">#{markerId},</if>
             <if test="markerName != null">#{markerName},</if>
             <if test="markerType != null">#{markerType},</if>
             <if test="address != null">#{address},</if>