Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml

@@ -6,6 +6,7 @@
     <select id="outMakeSure" parameterType="java.util.Map" statementType="CALLABLE">
         {call proc_out_masksure(
                 #{v_tray_code,mode=IN,jdbcType=VARCHAR},
+                #{v_type,mode=IN,jdbcType=VARCHAR},
                 #{v_result,mode=OUT,jdbcType=INTEGER},
                 #{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
         )}