Merge branch 'master' of ssh://blit.7drlb.com:29418/screen_api_v2

fengxiang

2017-12-22 66489dc04eb54b395ee9558de23e3a5767bb37c0

 src/main/java/com/moral/mapper/UserMapper.java

@@ -4,8 +4,8 @@
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;

//@Mapper
//@Repository
@Mapper
@Repository
public interface UserMapper {

    public AuthUser findByUsername(String name);