Merge branch 'dev-api' into dev

pla-sim/01_SQL/02_table/sim_major.sql

@@ -1,7 +1,7 @@
 /*
  Navicat Premium Dump SQL
 
- Source Server         : qdhome.iot321.top
+ Source Server         : qdhome.iot321.top-test
  Source Server Type    : MySQL
  Source Server Version : 50740 (5.7.40-log)
  Source Host           : qdhome.iot321.top:33003
@@ -11,7 +11,7 @@
  Target Server Version : 50740 (5.7.40-log)
  File Encoding         : 65001
 
- Date: 11/12/2024 00:39:35
+ Date: 11/12/2024 15:17:14
 */
 
 SET NAMES utf8mb4;
@@ -24,12 +24,12 @@ DROP TABLE IF EXISTS `sim_major`;
 CREATE TABLE `sim_major`  (
   `major_id` bigint(20) NOT NULL DEFAULT 0 AUTO_INCREMENT COMMENT '专业ID',
   `major_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '专业名称',
-  `createBy` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+  `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
   `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
   `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
   `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
   PRIMARY KEY (`major_id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'sim-专业表' ROW_FORMAT = DYNAMIC;
+) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'sim-专业表' ROW_FORMAT = DYNAMIC;
 
 SET FOREIGN_KEY_CHECKS = 1;

ruoyi-sim/src/main/java/com/ruoyi/sim/domain/Major.java

@@ -9,7 +9,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 专业对象 sim_major
  *
  * @author tom
- * @date 2024-12-10
+ * @date 2024-12-11
  */
 public class Major extends BaseEntity {
     private static final long serialVersionUID = 1L;

ruoyi-sim/src/main/java/com/ruoyi/sim/mapper/MajorMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.sim.domain.Major;
  * 专业Mapper接口
  *
  * @author tom
- * @date 2024-12-10
+ * @date 2024-12-11
  */
 public interface MajorMapper {
     /**

ruoyi-sim/src/main/java/com/ruoyi/sim/service/IMajorService.java

@@ -8,7 +8,7 @@ import com.ruoyi.sim.domain.Major;
  * 专业Service接口
  *
  * @author tom
- * @date 2024-12-10
+ * @date 2024-12-11
  */
 public interface IMajorService {
     /**

ruoyi-sim/src/main/java/com/ruoyi/sim/service/impl/MajorServiceImpl.java

@@ -13,7 +13,7 @@ import com.ruoyi.sim.service.IMajorService;
  * 专业Service业务层处理
  *
  * @author tom
- * @date 2024-12-10
+ * @date 2024-12-11
  */
 @Service
 public class MajorServiceImpl implements IMajorService {

ruoyi-sim/src/main/resources/mapper/sim/MajorMapper.xml

@@ -7,7 +7,7 @@
     <resultMap type="Major" id="MajorResult">
         <result property="majorId" column="major_id"/>
         <result property="majorName" column="major_name"/>
-        <result property="createBy" column="createBy"/>
+        <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
@@ -15,7 +15,7 @@
     </resultMap>
 
     <sql id="selectMajorVo">
-        select major_id, major_name, createBy, create_time, update_by, update_time, remark
+        select major_id, major_name, create_by, create_time, update_by, update_time, remark
         from sim_major
     </sql>
 
@@ -23,7 +23,6 @@
         <include refid="selectMajorVo"/>
         <where>
             <if test="majorName != null  and majorName != ''">and major_name like concat('%', #{majorName}, '%')</if>
-            <if test="createBy != null  and createBy != ''">and createBy = #{createBy}</if>
         </where>
     </select>
 
@@ -36,7 +35,7 @@
         insert into sim_major
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="majorName != null and majorName != ''">major_name,</if>
-            <if test="createBy != null">createBy,</if>
+            <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -56,7 +55,7 @@
         update sim_major
         <trim prefix="SET" suffixOverrides=",">
             <if test="majorName != null and majorName != ''">major_name = #{majorName},</if>
-            <if test="createBy != null">createBy = #{createBy},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>