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

This commit is contained in:
2025-11-20 15:25:12 +08:00

View File

@ -1,14 +1,9 @@
package com.xjrsoft.module.mdm.vo; package com.xjrsoft.module.mdm.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.xjrsoft.common.annotation.Trans; import com.xjrsoft.common.annotation.Trans;
import com.xjrsoft.common.enums.TransType; import com.xjrsoft.common.enums.TransType;
import java.time.LocalTime; import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime; import lombok.Data;
import java.math.BigDecimal;
/** /**
* @title: 分页列表出参 * @title: 分页列表出参
@ -38,7 +33,7 @@ public class LngBPlaceLngUnloadPageVo {
* 卸货区域 * 卸货区域
*/ */
@ApiModelProperty("卸货区域") @ApiModelProperty("卸货区域")
@Trans(type = TransType.API, id = "93d735dcb7364a0f8102188ec4d77ac7") @Trans(type = TransType.REGION)
private String regionCode; private String regionCode;
/** /**
* 详细地址 * 详细地址