Merge branch 'master' into dev

cweb/src/main/java/com/cweb/controller/BsMerController.java

@@ -464,6 +464,12 @@ public class BsMerController {
                 storeModel.setCreateTime(store.get(0).getCreateTime());
             }
 
+            storeModel.setCompanyId(mer.getCompanyId());
+            storeModel.setCompanyName(mer.getCompanyName());
+            storeModel.setAgentId(mer.getAgentId());
+            storeModel.setAgentName(mer.getAgentName());
+            storeModel.setSalesmanId(mer.getSalesmanId());
+            storeModel.setSalesmanName(mer.getSalesmanName());
             storeModel.setStoreType(mer.getMerType());
             storeModel.setStatus(StoreStatusEnum.status3.getNumber());
             storeModel.setBlisUrl(mer.getBlisUrl());