Merge branch 'master' into dev

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -401,9 +401,6 @@
 
     <!-- 边输边查承运商   -->
     <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
-        select
-        *
-        from(
         select
             RC.CARRIER_ID "carrierId",
             RC.CARRIER_NAME "value",
@@ -411,7 +408,7 @@
         from RMS_CARRIER RC
         <where>
             <if test="index != null">
-                'carrierName'  like #{index}
+                RC.CARRIER_NAME  like #{index}
                 and rownum &lt; 10
             </if>
             <if test="index == null">
@@ -419,7 +416,6 @@
             </if>
         </where>
         order by "value"
-        )
     </select>
 
     <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >