Merge remote-tracking branch 'origin/meiteng' into zql

# Conflicts:
#	sql/edu_modify_table.sql

src/main/java/org/rcisoft/business/blesson/service/impl/BLessonPersonServiceImpl.java

@@ -330,7 +330,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
                 //扣除对应积分 添加用户积分详情 更新用户积分
                 //增加用户积分详情
                 if (bLesson.getValueConsume() != null && !"0".equals(bLesson.getValueConsume()) && !(curUser.getUserId().equals(bLesson.getLecturerId()))){
-                    BPersonValue bPersonValue = new BPersonValue(curUser.getUserId(),"学完!@#课程",bLesson.getValueConsume(),"1",bLesson.getBusinessId());
+                    BPersonValue bPersonValue = new BPersonValue(curUser.getUserId(),"学习!@#课程",bLesson.getValueConsume(),"1",bLesson.getBusinessId());
                     bLessonServiceImpl.addValueEvent(curUser.getUserId(),bPersonValue,userInfo.getLockNum());
                 }
                 bLessonRepository.personNumberReCount(lessonAndUserDTO.getLessonId(),"0");
@@ -348,7 +348,7 @@ public class BLessonPersonServiceImpl implements BLessonPersonService {
             //增加用户积分详情
             //积分变化后 s_user表中value字段重新统计
             if (bLesson.getValueConsume() != null && !"0".equals(bLesson.getValueConsume()) && !(curUser.getUserId().equals(bLesson.getLecturerId()))){
-                BPersonValue bPersonValue = new BPersonValue(curUser.getUserId(),"学完!@#课程",bLesson.getValueConsume(),"1",bLesson.getBusinessId());
+                BPersonValue bPersonValue = new BPersonValue(curUser.getUserId(),"学习!@#课程",bLesson.getValueConsume(),"1",bLesson.getBusinessId());
                 bLessonServiceImpl.addValueEvent(curUser.getUserId(),bPersonValue,userInfo.getLockNum());
             }
             //重新统计在学人数