Merge branch 'master' into wangfy-dev

wfy

2021-09-14 cd33651deff9fff7e7d9651b766210771c075190

 service-community/src/main/java/com/java110/community/smo/impl/RoomAttrInnerServiceSMOImpl.java

old mode 100644
new mode 100755
@@ -2,6 +2,7 @@
package com.java110.community.smo.impl;


import com.java110.po.room.RoomAttrPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.community.dao.IRoomAttrServiceDao;
import com.java110.core.base.smo.BaseServiceSMO;
@@ -56,8 +57,13 @@
    }

    @Override
    public int saveRoomAttr(@RequestBody RoomAttrDto roomAttrDto) {
        return roomAttrServiceDaoImpl.saveRoomAttr(BeanConvertUtil.beanCovertMap(roomAttrDto));
    public int saveRoomAttr(@RequestBody RoomAttrPo roomAttrPo) {
        return roomAttrServiceDaoImpl.saveRoomAttr(BeanConvertUtil.beanCovertMap(roomAttrPo));
    }

    @Override
    public int updateRoomAttrInfoInstance(@RequestBody RoomAttrPo roomAttrPo) {
        return roomAttrServiceDaoImpl.updateRoomAttrInfoInstance(BeanConvertUtil.beanCovertMap(roomAttrPo));
    }

    public IRoomAttrServiceDao getRoomAttrServiceDaoImpl() {