Merge branch 'master' into 'test'

审批-通过/驳回修改

See merge request !15

src/main/resources/mapper/Questionnaire.xml

@@ -579,10 +579,7 @@
 
 	<!--更新问题表的分数，汇总统计使用-->
 	<update id="updateAnswerScore">
-		UPDATE t_answer
-		<trim prefix="SET" suffixOverrides=",">
-			<if test="score != null and score != ''">score = #{score}</if>
-		</trim>
+		UPDATE t_answer SET score = #{score}
 		WHERE record_id = #{recordId} and options_id = #{optionsId}
 	</update>