Merge branch 'dev_20260429' into dev_WMS20260401

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteOmsFeignFallbackFactory.java
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteUserFeignFallbackFactory.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/application/service/batchDetail/BatchDetailApplicationService.java
#	mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/batchDetail/service/BatchDetailDomainService.java
#	mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/sysTableConfig/SysTableConfigApi.java

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java

@@ -263,4 +263,16 @@ public class UserShipperEntity extends BaseVOEntity {
 
     @ApiModelProperty(name = "组织名称")
     private String organizationName;
+
+    @ApiModelProperty(name = "推送状态 1-未推送 2-推送中 3-推送成功 4-推送失败")
+    private Integer pushStatus;
+    @ApiModelProperty(name = "推送时间")
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+    @ApiModelProperty(name = "推送人")
+    private Long pushBy;
+    @ApiModelProperty(name = "推送人姓名")
+    private String pushByName;
+
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java

@@ -7,6 +7,7 @@ import com.mhd.user.domain.userAggregate.repository.todo.UserShipperDO;
 import com.mhd.user.domain.userAggregate.repository.po.UserShipperPo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
@@ -28,4 +29,11 @@ public interface UserShipperMapper extends BaseMapper<UserShipperEntity> {
     List<UserShipperEntity> selectBySealId(@Param("userShipperEntity") UserShipperEntity userShipperEntity);
 
     public com.mhd.common.core.domain.po.UserShipperPo getShipperSummaryData(Long userId);
+
+    /**
+     *
+     * @param userShipper
+     * @return
+     */
+    int updatePushStatus(UserShipperEntity userShipper);
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java

@@ -321,4 +321,18 @@ public class UserShipperPo implements Serializable {
 
     @ApiModelProperty(name = "备注")
     private String userRemarkShipper;
+
+    @ApiModelProperty(value = "推送状态：1-未推送，2-推送中，3-推送成功，4-推送失败")
+    private Integer pushStatus;
+
+    @ApiModelProperty(value = "推送时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date pushTime;
+
+    @ApiModelProperty(value = "推送人ID")
+    private Long pushBy;
+
+    @ApiModelProperty(value = "推送人姓名")
+    private String pushByName;
 }

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java

@@ -288,4 +288,25 @@ public class UserShipperDO extends UserDO {
 
     @ApiModelProperty(name = "备注")
     private String userRemark;
+
+    @ApiModelProperty("创建时间起")
+    private Date createTimeFrom;
+
+    @ApiModelProperty("创建时间止")
+    private Date createTimeTo;
+
+    @ApiModelProperty("更新时间起")
+    private String updateTimeFrom;
+
+    @ApiModelProperty("更新时间止")
+    private String updateTimeTo;
+
+    @ApiModelProperty("推送状态")
+    private Integer pushStatus;
+
+    @ApiModelProperty("推送时间起")
+    private String pushTimeFrom;
+
+    @ApiModelProperty("推送时间止")
+    private String pushTimeTo;
 }