Merge remote-tracking branch 'origin/ywx' into wn

smarking/src/main/resources/mapper/stupaper/MsPaperStudentQuestionMapper.xml

@@ -147,7 +147,7 @@
             </foreach>
         </trim>
         <if test="block.firstcime!=null and block.firstcime!=0">
-            <trim prefix="firstccore = case mptqid" suffix="end,">
+            <trim prefix=",firstccore = case mptqid" suffix="end,">
                <foreach collection="list" item="q" separator=" ">
                    when #{q.mptqid} then #{q.firstccore}
                </foreach>
@@ -155,7 +155,7 @@
             firstcid=#{block.firstcid},firstcime=#{block.firstcime}
         </if>
         <if test="block.secondctime!=null and block.secondctime!=0">
-            <trim prefix="secondcscore = case mptqid" suffix="end,">
+            <trim prefix=",secondcscore = case mptqid" suffix="end,">
                 <foreach collection="list" item="q" separator=" ">
                     when #{q.mptqid} then #{q.secondcscore}
                 </foreach>