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

jyy

2021-03-15 53939e0ceb528f45c4906c86ce499ecb864f7af8

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/WxUserAction.java

@@ -92,9 +92,11 @@
               // 新增用户
               bizUser = new BizUser();
               bizUser.setSessionKey(sessionKey);
               bizUser.setIsSales(BizUser.NOT_SALES);
               bizUser.setOpenId(openId);
               bizUser.setLastLoginTime(new Date());
               bizUser.setUserType(AppConstance.USER_TYPE_CUSTOMER);
               bizUser.setCompanyId(HostInterceptor.getCompanyId());
               bizUserService.add(bizUser);

            } else {