Merge remote-tracking branch 'origin/dev' into zs

src/main/java/com/chaozhanggui/system/cashierservice/controller/LoginContoller.java

@@ -208,6 +208,7 @@ public class LoginContoller {
                 return loginService.upPhone(openId,JSONObject.parseObject(data).get("phoneNumber").toString(),map.get("shopId").toString());
             }
         } catch (Exception e){
+//            e.printStackTrace();
             log.info("登录传参 获取手机号失败 sessionKey:{}\n encryptedData:{} \nivStr:{} \n data:{},",sessionKey,encryptedData,ivStr,data);
         }
         return Result.fail("获取手机号失败,请重试！");