1.修改工作经历和教育经历实体类位置，方便移动端用户可以修改自己的信息

2.修改es按照名称或者类型查询的逻辑

ruoyi-bussiness/src/main/resources/mapper/app/AppUserEducationMapper.xml

@@ -20,6 +20,7 @@
         <result column="create_time"    property="createTime"/>
         <result column="update_by"      property="updateBy"/>
         <result column="update_time"    property="updateTime"/>
+        <result column="remark"    property="remark"/>
     </resultMap>
 
     <sql id="selectAppUserEducationVo">
@@ -51,4 +52,21 @@
         order by sort asc
     </select>
 
+    <insert id="batchInsert">
+        INSERT INTO app_user_education (
+        user_id, school_name, education_level, major, degree, study_type,
+        start_time, end_time, content, sort, del_flag, create_by, create_time,
+        update_by, update_time,remark
+        ) VALUES
+        <foreach collection="appUserEducations" item="item" separator=",">
+            (
+            #{item.userId}, #{item.schoolName}, #{item.educationLevel},
+            #{item.major}, #{item.degree}, #{item.studyType}, #{item.startTime},
+            #{item.endTime}, #{item.content}, #{item.sort}, #{item.delFlag},
+            #{item.createBy}, #{item.createTime}, #{item.updateBy}, #{item.updateTime},
+            #{item.remark}
+            )
+        </foreach>
+    </insert>
+
 </mapper>

ruoyi-bussiness/src/main/resources/mapper/app/AppUserTrainMapper.xml

@@ -17,6 +17,7 @@
         <result column="create_time"    property="createTime"/>
         <result column="update_by"      property="updateBy"/>
         <result column="update_time"    property="updateTime"/>
+        <result column="remark"    property="remark"/>
     </resultMap>
 
     <sql id="selectAppUserTrainVo">
@@ -48,4 +49,20 @@
         order by sort asc
     </select>
 
+    <insert id="batchInsert">
+        INSERT INTO app_user_train (
+        user_id, train_org, train_course, start_time, end_time,
+        train_cert, train_content, sort, del_flag, create_by, create_time,
+        update_by, update_time,remark
+        ) VALUES
+        <foreach collection="appUserTrains" item="item" separator=",">
+            (
+            #{item.userId}, #{item.trainOrg}, #{item.trainCourse},
+            #{item.startTime}, #{item.endTime}, #{item.trainCert}, #{item.trainContent},
+            #{item.sort}, #{item.delFlag}, #{item.createBy}, #{item.createTime},
+            #{item.updateBy}, #{item.updateTime}, #{item.remark}
+            )
+        </foreach>
+    </insert>
+
 </mapper>