Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7

@@ -1601,7 +1601,7 @@ public class InBoxFacade {
                 if(autoReSell){
                     sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
                 }
-                String content = replaceSMSContent(sms,skupTypeText, orderCode, prdName,sizeName,productCode);
+                String content = replaceSMSContent(sms, orderCode,skupTypeText, prdName,sizeName,productCode);
                 sendSmsService.smsSendByMobile(content,mobileList);
                 logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
                         sellerUid, orderCode, prdName);