bug fix

bsoft-api/src/main/resources/mapper/DicDimMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bsoft.api.mapper.DicDimMapper">
     <resultMap id="BaseResultMap" type="com.bsoft.api.model.DicDim">
-    <id column="ID" jdbcType="DECIMAL" property="id" />
-    <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate" />
-    <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid" />
-    <result column="STATE" jdbcType="DECIMAL" property="state" />
-    <result column="DIM_NAME" jdbcType="VARCHAR" property="dimName" />
-    <result column="DIM_FIELD" jdbcType="VARCHAR" property="dimField" />
+        <id column="ID" jdbcType="DECIMAL" property="id"/>
+        <result column="CREATE_DATE" jdbcType="TIMESTAMP" property="createDate"/>
+        <result column="CREATE_USERID" jdbcType="DECIMAL" property="createUserid"/>
+        <result column="STATE" jdbcType="DECIMAL" property="state"/>
+        <result column="DIM_NAME" jdbcType="VARCHAR" property="dimName"/>
+        <result column="DIM_FIELD" jdbcType="VARCHAR" property="dimField"/>
     </resultMap>
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from LL.DIC_DIM

bsoft-api/src/main/resources/mapper/SerBlockMapper.xml

@@ -36,7 +36,6 @@
     where ID = #{id,jdbcType=DECIMAL}
   </update>
   <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-<<<<<<< HEAD
     select ID, CREATE_DATE, CREATE_USERID, STATE, BLOCK_CODE, BLOCK_NAME, RETURN_TYPE
     from LL.SER_BLOCK
     where ID = #{id,jdbcType=DECIMAL}

bsoft-api/src/main/resources/mapper/SysMenuMapper.xml

@@ -66,5 +66,4 @@
         where umr.STATE=1 and m.STATE=1  and  umr.USER_ID = #{userId,jdbcType=DECIMAL}
 
   </select>
-    <select id="selectMenuByUser" resultType="com.bsoft.api.model.respmodel.SysMenuList"></select>
 </mapper>
\ No newline at end of file