Merge remote-tracking branch 'origin/master'

aucma-api/src/main/resources/mapper/PdaBindingMapper.xml

@@ -11,7 +11,7 @@
 
     <insert id="insertBindingInfo">
         INSERT INTO CODE_BINDING(OBJ_ID, BOX_CODE, BOX_NAME, LINER_CODE, BINDING_RESULT, RECORD_TIME1)
-        VALUES (SEQ_CODE_BINDING.nextval, #{boxCode}, #{boxName}, #{innerCode}, '成功', SYSDATE)
+        VALUES (SEQ_CODE_BINDING.nextval, #{boxCode}, #{boxName,jdbcType=NVARCHAR}, #{innerCode}, '成功', SYSDATE)
     </insert>
     <update id="updateCodeBinding">
         UPDATE CODE_BINDING

aucma-report/src/main/resources/mapper/report/ReportQualityInspectionMapper.xml

@@ -118,7 +118,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="objId != null">#{objId},</if>
             <if test="barCode != null">#{barCode},</if>
-            <if test="materialName != null">#{materialName},</if>
+            <if test="materialName != null">#{materialName,jdbcType=NVARCHAR},</if>
             <if test="processCode != null">#{processCode},</if>
             <if test="testItemCode != null">#{testItemCode},</if>
             <if test="qualityDefectCode != null">#{qualityDefectCode},</if>