Merge branch 'master' into developer

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java

@@ -148,7 +148,7 @@ public class StoreController extends WebBaseController {
             vo.setClerkName(clerk.getClerkName());
             vo.setHeadImg(staffDTO.getHeadImg());
             vo.setBindFlag(1);
-            vo.setEnterpriseName(enterpriseDTO.getEnterpriseName());
+            vo.setEnterpriseName(enterpriseDTO.getBrandName());
             vo.setCorpName(wxEnterpriseDTO.getCorpName());
             list.add(vo);
         }