Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/student/entity/StudentChangeRecord.java

@@ -62,13 +62,13 @@ public class StudentChangeRecord implements Serializable {
     @ApiModelProperty("删除标记(0:未删除 1:已删除)")
     @TableField(fill = FieldFill.INSERT)
     @TableLogic
-    private Object deleteMark;
+    private Integer deleteMark;
     /**
     * 有效标记(0:未启用 1:已启用)
     */
     @ApiModelProperty("有效标记(0:未启用 1:已启用)")
     @TableField(fill = FieldFill.INSERT)
-    private Object enabledMark;
+    private Integer enabledMark;
     /**
     * 学生id(xjr_user)
     */

src/main/java/com/xjrsoft/module/student/service/impl/StudentReportRecordServiceImpl.java

@@ -204,8 +204,8 @@ public class StudentReportRecordServiceImpl extends MPJBaseServiceImpl<StudentRe
         String afterData = StudyStatusEnum.fromCode(afterDataCode);
 
         changeRecordService.insertData(
-                beforeDataCode, beforeData,
-                afterDataCode, afterData,
+                beforeData,beforeDataCode,
+                afterData,afterDataCode,
                 StpUtil.getLoginIdAsLong(), StpUtil.getLoginIdAsLong(),
                 StudentChangeTypeEnum.StduyStatus.getCode(), 3
         );