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

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

@@ -9,7 +9,6 @@
 		a.orderProductID AS "orderProductID",
 		a.shopID AS "shopID",
 		a.shopOrderID as "shopOrderID",
-		a.returnedReceiver AS "returnedReceiver",
 		a.applicationReturnedNum AS "applicationReturnedNum",
 		a.applicationCancelNum AS "applicationCancelNum",
 		a.actualReturnedNum AS "actualReturnedNum",