Merge remote-tracking branch 'origin/master' into xinghong-dev

xiaogang

2021-08-20 47f882588d1d18df404478bc79cc53cb608549a2

 service-user/src/main/java/com/java110/user/smo/impl/OwnerInnerServiceSMOImpl.java

old mode 100644
new mode 100755
@@ -1,6 +1,5 @@
package com.java110.user.smo.impl;


import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.CommunityMemberDto;
import com.java110.dto.PageDto;
@@ -268,7 +267,7 @@
    @Override
    public int updateOwnerMember(OwnerPo ownerPo) {
        Map info = BeanConvertUtil.beanCovertMap(ownerPo);
        info.put("statusCd","0");
        info.put("statusCd", "0");
        ownerServiceDaoImpl.updateOwnerInfoInstance(info);
        return 1;
    }
@@ -288,6 +287,12 @@
        return BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.queryOwnerLogsByRoom(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
    }

    @Override
    public List<OwnerDto> queryAllOwners(@RequestBody OwnerDto ownerDto) {
        List<OwnerDto> allOwners = BeanConvertUtil.covertBeanList(ownerServiceDaoImpl.getOwnerInfo(BeanConvertUtil.beanCovertMap(ownerDto)), OwnerDto.class);
        return allOwners;
    }

    public IUserInnerServiceSMO getUserInnerServiceSMOImpl() {
        return userInnerServiceSMOImpl;
    }