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

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1833,7 +1833,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         erpOrder.setPayments(payments);
         if (order.getCompanyId() != null) {
             Company company = companyService.selectCompanyById(order.getCompanyId());
-            if (company != null) {
+            if (company != null&& ObjectUtil.isEmpty(erpOrder.getSeller_memo())) {
                 erpOrder.setSeller_memo(company.getCompanyName());
             }
         }