Merge remote-tracking branch 'origin/hotfixes_v5.0.2_20240311_updates' into dev_v5.0.3

examcloud-core-examwork-dao/src/main/java/cn/com/qmth/examcloud/core/examwork/dao/entity/ExamIpLimitEntity.java

@@ -46,6 +46,10 @@ public class ExamIpLimitEntity extends JpaEntity {
 	@Enumerated(EnumType.STRING)
 	private IpLimitType limitType;
 
+	/**
+	 * ip地址归属的学习中心备注信息
+	 */
+	private String remark;
 
 	public Long getId() {
 		return id;
@@ -78,4 +82,13 @@ public class ExamIpLimitEntity extends JpaEntity {
 	public void setLimitType(IpLimitType limitType) {
 		this.limitType = limitType;
 	}
+
+	public String getRemark() {
+		return remark;
+	}
+
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+
 }

examcloud-core-examwork-starter/src/main/resources/exam-properties.xml

@@ -336,4 +336,10 @@
         <desc>交卷冻结时间类型</desc>
         <valueType>STRING</valueType>
     </enum>
+    <enum>
+        <id>57</id>
+        <name>SHOW_MULTIPLE_CHOICE_WARNING</name>
+        <desc>是否考生作答多选题所选答案不足两个时警告提示</desc>
+        <valueType>BOOLEAN</valueType>
+    </enum>
 </enums>