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

lidongdong

2022-11-10 38596b03540250dd7de85c49f53ece5dd6bfe5b7

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java

@@ -60,6 +60,9 @@
            if (isNotBlank(comPropertyVO.getAccount())) {
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                administratorsUserVO.setType(3);
                if (comPropertyVO.getCommunityId().equals(10172)){
                    administratorsUserVO.setType(20);
                }
                administratorsUserVO.setAccount(comPropertyVO.getAccount());
                administratorsUserVO.setPassword(comPropertyVO.getPassword());
                administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
@@ -142,4 +145,9 @@
        comPropertyVO.setPassword(null);
        return R.ok(comPropertyVO);
    }

    @Override
    public R noticeList(Integer page, Integer size, Long propertyId) {
        return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId));
    }
}