Merge remote-tracking branch 'remotes/origin/yufei' into master

lyfO_o

2021-09-16 074c6c4389938fc38e82b6258b8ebab95fb5aff9

 src/main/java/com/nanometer/smartlab/dao/BaseRoleDao.java

@@ -17,6 +17,8 @@

    public void insertBaseRole(BaseRole baseRole) throws DataAccessException;
    public int updateBaseRole(BaseRole baseRole) throws DataAccessException;
    public int updateBaseRoleInfo(BaseRole baseRole);
    public int deleteBaseRoles(List<String> ids) throws DataAccessException;

    BaseRole getBaseRoleByUser(String id);
}