Merge branch 'refs/heads/zcwy0622-yang' into dev0525

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
This commit is contained in:
yang
2024-07-11 16:34:18 +08:00

View File

@@ -179,5 +179,7 @@ public class ExamTest extends BaseEntity {
@Transient
private String paperName;
/** 关联类型1、项目 2、学习路径图 3、面授课 14、成长路径图 */
@Column(name = "ref_type")
private Integer refType;
}