Merge branch 'dm_20251204' into dev

# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
#	mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

mhd_transport/pom.xml

@@ -74,9 +74,14 @@
             <artifactId>mhd-common-redis</artifactId>
         </dependency>
         <!-- Mysql Connector -->
-        <dependency>
+        <!--<dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
         </dependency>
         <!--添加druid连接池 依赖 -->
         <dependency>

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.command;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -25,6 +26,7 @@ public class CreateMaterialCommand {
   private String name;
 
   @ApiModelProperty(value = "物料型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
 
   @NotBlank(message = "物料单位不能为空")

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.command;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class UpdateMaterialCommand {
   @ApiModelProperty(value = "物料名称")
   private String name;
   @ApiModelProperty(value = "物料型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty(value = "物料单位")
   private String unit;

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.query;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -16,6 +17,7 @@ public class MaterialQueryCommand {
   @ApiModelProperty(name = "名称")
   private String name;
   @ApiModelProperty(name = "型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty("物料编码")
   private String materialCode;

mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java

@@ -1,5 +1,6 @@
 package com.linke.transport.application.service.warehouse.material.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class MaterialVO{
   @ApiModelProperty("名称")
   private String name;
   @ApiModelProperty("型号")
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   @ApiModelProperty("单位")
   private String unit;

mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java

@@ -1,5 +1,6 @@
 package com.linke.transport.domain.warehouse.material.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.linke.transport.domain.warehouse.material.MaterialCodeGenerator;
 import com.linke.transport.domain.warehouse.material.exception.MaterialDomainException;
 import com.mhd.common.core.utils.StringUtils;
@@ -20,8 +21,10 @@ public class Material {
   private Long ownerId;
   private String category;
   private String name;
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   private String unit;
+  @TableField("\"VALUE\"")  // 字段名转义
   private BigDecimal value;
   private boolean codeManaged;
   private String remark;

mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java

@@ -21,6 +21,7 @@ public class MaterialDO {
   private Long ownerId;
   private String category;
   private String name;
+  @TableField("\"MODEL\"")  // 字段名转义
   private String model;
   private String unit;
   private BigDecimal value;

mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml

@@ -33,12 +33,12 @@
     i.material_id,
     m.category AS material_category,
     m.name AS material_name,
-    m.model AS material_model,
+    m."MODEL" AS material_model,
     i.quantity,
     m.unit,
     m.weight,
     m.code_managed,
-    m.value,
+    m."VALUE",
     i.machine_serial_no,
     i.created_at
     FROM
@@ -91,7 +91,7 @@
            i.material_id,
            m.category AS material_category,
            m.name     AS material_name,
-           m.model    AS material_model,
+           m."MODEL"    AS material_model,
            i.quantity,
            m.unit,
            m.weight,