Merge branch 'master' of http://103.249.252.28:90/lcy/education

# Conflicts:
#	src/main/resources/application-dev.yml

src/main/java/org/rcisoft/sys/user/dao/SysUserMapper.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.*;
 import org.rcisoft.core.base.BaseMapper;
 import org.rcisoft.sys.user.entity.SysUser;
 import org.rcisoft.sys.user.entity.UserRole;
+import org.springframework.stereotype.Repository;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -14,6 +15,7 @@ import static javafx.scene.input.KeyCode.V;
 /**
  * Created by lcy on 17/8/9.
  */
+@Repository
 public interface SysUserMapper extends BaseMapper<SysUser> {