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

src/main/resources/mapper/assessment/AssessmentTemplatePlanMapper.xml

@@ -5,7 +5,7 @@
 <mapper namespace="com.xjrsoft.module.assessment.mapper.AssessmentTemplatePlanMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.assessment.dto.AssessmentTemplatePlanPageDto" resultType="com.xjrsoft.module.assessment.vo.AssessmentTemplatePlanPageVo">
         SELECT t1.id,t1.name,t1.score,t1.start_time,t1.status,t1.end_time,t2.name AS assessment_template_name,
-        t1.assessment_template_id,t1.type,t1.randomNumber FROM assessment_template_plan t1
+        t1.assessment_template_id,t1.type,t1.random_number FROM assessment_template_plan t1
         LEFT JOIN assessment_template t2 ON t1.assessment_template_id = t2.id
         WHERE t1.delete_mark = 0
         <if test="dto.name != null and dto.name != ''">