Merge branch 'dev-snyx' into test

order-management-consumer/src/main/resources/mybatis/mapper/OrderProcessInfoMapper.xml

@@ -146,29 +146,29 @@
 
     <select id="queryOrderProcessInfoByBzdh" parameterType="java.lang.String" resultMap="BaseResultMap">
         SELECT
-          <include refid="Base_Column_List"/>
+          op.*
         FROM
            order_process_info op
            inner join order_invoice_info oii on oii.order_info_id = op.order_info_id
         WHERE
-        bzdh = #{bzdh,jdbcType=VARCHAR}
+        op.bzdh = #{bzdh,jdbcType=VARCHAR}
         <if test="shList != null and shList.size() == 0">
-            and xhf_nsrsbh = ''
+            and op.xhf_nsrsbh = ''
         </if>
         <if test="shList != null and shList.size() == 1">
-            and xhf_nsrsbh =
+            and op.xhf_nsrsbh =
             <foreach collection="shList" index="index" item="item">
                 #{item}
             </foreach>
         </if>
         <if test="shList != null and shList.size() > 1">
-            and xhf_nsrsbh in
+            and op.xhf_nsrsbh in
             <foreach collection="shList" index="index" item="item"
                      open="(" separator="," close=")">
                 #{item}
             </foreach>
         </if>
-        and order_status = '0'
+        and op.order_status = '0'
         and oii.zf_bz = '0'
     </select>