Merge remote-tracking branch 'origin/dev_WMS20260401' into dev_WMS20260401

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/po/UserPo.java

@@ -253,4 +253,16 @@ public class UserPo {
 
     @ApiModelProperty("结算币种")
     private String settlementCurrency;
+
+    @ApiModelProperty("路线id")
+    private String lineManagementId;
+
+    @ApiModelProperty("路线编码")
+    private String routeCode;
+
+    @ApiModelProperty("路线名称")
+    private String routeName;
+
+    @ApiModelProperty("配送顺序")
+    private String deliveryOrder;
 }

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -80,7 +80,11 @@
                a.payment_account,
                a.invoice_title,
                a.tax_number,
-               b.SETTLEMENT_CURRENCY
+               b.SETTLEMENT_CURRENCY,
+               a.LINE_MANAGEMENT_ID,
+               a.ROUTE_CODE,
+               a.ROUTE_NAME,
+               a.DELIVERY_ORDER
         FROM "USER" a left join USER_SHIPPER b on a.user_id = b.user_id
         where a.del_flag = 1
     </sql>
@@ -244,6 +248,19 @@
             and a.user_id = #{userId}
         </if>
 
+        <if test="lineManagementId != null and lineManagementId != ''">
+            and a.line_management_id = #{lineManagementId}
+        </if>
+        <if test="routeCode != null and routeCode != ''">
+            and a.route_code = #{routeCode}
+        </if>
+        <if test="routeName != null and routeName != ''">
+            and a.route_name = #{routeName}
+        </if>
+        <if test="deliveryOrder != null and deliveryOrder != ''">
+            and a.delivery_order = #{deliveryOrder}
+        </if>
+
         <!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
         <if test="organizationId != null">
             <!-- 如果设置了 organizationId，添加 organization_id 条件 -->