Merge branch 'test_warehouse' into test

101captain

2021-10-15 9bfe692752f1dc1a2a0c0c825a88335de30b92f6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -89,8 +89,8 @@
    public Long getAreaId() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long areaId = loginUserInfo.getAreaId();
        if (null == areaId || 0 == areaId) {
            throw new ServiceException("用户未绑定社区");
        if (null == areaId) {
            throw new ServiceException("用户未绑定小区");
        }
        return areaId;
    }