Merge remote-tracking branch 'origin/master'

rk

7 小时以前 55642c818f14bf8cf52c98e6858014bd8dc3d3a7

 server/web/src/main/java/com/doumee/api/web/AccountApi.java

@@ -61,6 +61,7 @@
        return  ApiResponse.success("操作成功",memberService.wxAuthPhone(wxPhoneRequest));
    }


    @ApiOperation(value = "门店账号密码登录", notes = "小程序端，门店用户通过手机号+密码登录")
    @PostMapping("/shopLogin")
    public ApiResponse<ShopLoginVO> shopLogin(@RequestBody @Validated ShopLoginDTO dto) {