Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserMapper.xml

@@ -13,7 +13,7 @@
         <result column="name" property="name"/>
         <result column="mobile" property="mobile"/>
         <result column="status" property="status"/>
-    </resultMap>childSimpleList
+    </resultMap>
 
     <select id="childSimpleList" parameterType="java.lang.String" resultMap="simpleList">
         SELECT
@@ -22,7 +22,7 @@
         mobile
         FROM kylin_check_user
         <where>
-            merchant_id=#{merchantId} AND stauts = 1
+            merchant_id=#{merchantId} AND `status` = 1
             <if test="mobile !=null and mobile !='' ">
                 AND `mobile` LIKE concat('%', #{mobile}, '%')
             </if>