Merge remote-tracking branch 'origin/developer' into developerD

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -704,7 +704,7 @@
                 </foreach>
             </if>
             <if test="receiptStatus != null and receiptStatus!= ''">
-                AND receiptStatus = #{receiptStatus}
+                AND co.receiptStatus = #{receiptStatus}
             </if>
             <if test="refundType !=null and refundType != ''">
                 <if test="refundType == 1 or refundType == 2">