Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -91,6 +91,7 @@ public class CommonController
         }
         catch (Exception e)
         {
+            e.getMessage();
             return AjaxResult.error(e.getMessage());
         }
     }

ruoyi-system/src/main/resources/mapper/system/KaoqinRecordMapper.xml

@@ -30,9 +30,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="kaTypeAmIn"    column="ka_type_am_in"    />
         <result property="kaTypeAmOut"    column="ka_type_am_out"    />
         <result property="kaTypePmIn"    column="ka_type_pm_in"    />
-        <result property="kaTypePmOut"    column="ka_am_in_photo"    />
+        <result property="kaTypePmOut"    column="ka_type_pm_out"    />
         <result property="kaAmInPhoto"    column="ka_am_out_photo"    />
-        <result property="kaAmOutPhoto"    column="ka_type_pm_out"    />
+        <result property="kaAmOutPhoto"    column="ka_type_pm_photo"    />
         <result property="kaPmInPhoto"    column="ka_pm_in_photo"    />
         <result property="kaPmOutPhoto"    column="ka_pm_out_photo"    />
         <result property="kaStatus"    column="ka_status"    />
@@ -119,8 +119,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="kaTypeAmOut != null">ka_type_am_out,</if>
             <if test="kaTypePmIn != null">ka_type_pm_in,</if>
             <if test="kaTypePmOut != null">ka_type_pm_out,</if>
-            <if test="kaAmInPhoto != null">ka_type_pm_out,</if>
-            <if test="kaAmOutPhoto != null">ka_am_in_photo,</if>
+            <if test="kaAmInPhoto != null">ka_am_in_photo,</if>
+            <if test="kaAmOutPhoto != null">ka_am_out_photo,</if>
             <if test="kaPmInPhoto != null">ka_pm_in_photo,</if>
             <if test="kaPmOutPhoto != null">ka_pm_out_photo,</if>
             <if test="kaStatus != null">ka_status,</if>