diff --git a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
index 75e3c63f..53617324 100644
--- a/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
+++ b/ruoyi-admin/src/main/resources/templates/system/partner/partner.html
@@ -10,6 +10,9 @@
justify-content: flex-start;
flex-wrap: wrap;
}
+ .select-list li p, .select-list li label:not(.radio-box){
+ width: 80px;
+ }
diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
index e626ad5a..751221c1 100644
--- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
+++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/DeliveryList.java
@@ -4,6 +4,7 @@ import java.util.Date;
import java.util.StringJoiner;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
@@ -15,6 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-04-11
*/
+@Data
public class DeliveryList extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -54,115 +56,8 @@ public class DeliveryList extends BaseEntity
// @Excel(name = "删除时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date deletedAt;
+ private String productName;
+ private String description;
- public String getOrderCode() {
- return orderCode;
- }
-
- public void setOrderCode(String orderCode) {
- this.orderCode = orderCode;
- }
-
- public String getProductCode() {
- return productCode;
- }
-
- public void setProductCode(String productCode) {
- this.productCode = productCode;
- }
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setDeliveryId(Long deliveryId)
- {
- this.deliveryId = deliveryId;
- }
-
- public Long getDeliveryId()
- {
- return deliveryId;
- }
-
- @Override
- public String getRemark() {
- return remark;
- }
-
- @Override
- public void setRemark(String remark) {
- this.remark = remark;
- }
-
- public void setSerialNumber(String serialNumber)
- {
- this.serialNumber = serialNumber;
- }
-
- public String getSerialNumber()
- {
- return serialNumber;
- }
-
- public void setCreatedAt(Date createdAt)
- {
- this.createdAt = createdAt;
- }
-
- public Date getCreatedAt()
- {
- return createdAt;
- }
-
- public void setUpdatedAt(Date updatedAt)
- {
- this.updatedAt = updatedAt;
- }
-
- public Date getUpdatedAt()
- {
- return updatedAt;
- }
-
- public void setDeletedAt(Date deletedAt)
- {
- this.deletedAt = deletedAt;
- }
-
- public Date getDeletedAt()
- {
- return deletedAt;
- }
-
- public String getModel() {
- return model;
- }
-
- public void setModel(String model) {
- this.model = model;
- }
-
- @Override
- public String toString() {
- return new StringJoiner(", ", DeliveryList.class.getSimpleName() + "[", "]")
- .add("id=" + id)
- .add("deliveryId=" + deliveryId)
- .add("model=" + model)
- .add("orderCode='" + orderCode + "'")
- .add("productCode='" + productCode + "'")
- .add("serialNumber='" + serialNumber + "'")
- .add("remark='" + remark + "'")
- .add("createdAt=" + createdAt)
- .add("updatedAt=" + updatedAt)
- .add("deletedAt=" + deletedAt)
- .toString();
- }
}
diff --git a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
index 1d6c9398..38057c76 100644
--- a/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
+++ b/ruoyi-sip/src/main/resources/mapper/manage/DeliveryListMapper.xml
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select t1.id, t1.delivery_id,t1.product_code, t1.serial_number, t1.remark, t1.created_at, t1.updated_at, t1.deleted_at,
t2.delivery_code,
- t3.product_code, t3.product_name,t3.model,
+ t3.product_code, t3.product_name,t3.model,t3.description,
t4.order_code
from delivery_list t1
left join order_delivery t2 on t1.delivery_id = t2.id