Merge branch 'feature/1022_vip' into dev

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/PeriodEnum.java

@@ -6,7 +6,7 @@ import com.ym.mec.common.enums.BaseEnum;
  * 周期
  */
 public enum PeriodEnum implements BaseEnum<String, PeriodEnum> {
-	DAY("日"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
+	DAY("天"), MONTH("月"), QUARTERLY("季度"), YEAR_HALF("半年"), YEAR("年");
 
 	private String msg;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -1608,7 +1608,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
                     null,
                     0,
                     null,
-                    "STUDENT",param.getType()==3?"扣减":"获得",param.getNumber(),
+                    "STUDENT",param.getType()==3?"扣减":"获得",param.getNumber()+
                     param.getPeriodType().getMsg(),studentMemberUpdateLog.getName(),param.getMemo());
         }
     }