合并代码 并且解决冲突

xiaogang

2021-04-01 b64dfe0172b04830bd16c3aa5757fa87d291057f

 service-user/src/main/java/com/java110/user/dao/impl/UserAttrServiceDaoImpl.java

@@ -126,5 +126,16 @@
        return Integer.parseInt(businessUserAttrInfos.get(0).get("count").toString());
    }

    /**
     * 保存用户属性
     * @param info
     * @return
     */
    @Override
    public int saveUserAttr(Map info) {
        int saveFlag = sqlSessionTemplate.insert("userAttrServiceDaoImpl.saveUserAttr",info);
        return saveFlag;
    }


}