Feature/wr 330 查看合并请求 !1
# Conflicts: # app/src/main/java/com/yinhebairong/clasmanage/utils/BarChartManager.java