diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java index 738f4f5..0d46315 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConPurchase.java @@ -174,6 +174,12 @@ public class ConPurchase extends BaseEntityAdd { @FieldNameApi(name = "媒体链条附件") private String mediaLink; + /** + * 检测照片附件 + */ + @FieldNameApi(name = "检测照片附件") + private String detectPicAttr; + /** * 是否逾期0否1是 */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java index 2eb5877..0101131 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/ConSaleMedia.java @@ -1,5 +1,6 @@ package com.ruoyi.contract.domain; +import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.*; import com.ruoyi.common.annotation.FieldNameApi; import com.ruoyi.common.core.domain.BaseEntityAdd; @@ -147,4 +148,16 @@ public class ConSaleMedia extends BaseEntityAdd { */ @FieldNameApi(name ="其他返点金额") private Double otherReverMoney; + + /** + * 其他返点2 + */ + @FieldNameApi(name ="其他返点2") + private String otherReverPoit2; + + /** + * 其他返点金额2 + */ + @FieldNameApi(name ="其他返点金额2") + private Double otherReverMoney2; } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java index eb6c4fc..9d3003e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/bo/ConPurchaseBo.java @@ -209,6 +209,12 @@ public class ConPurchaseBo extends BaseEntity { @CustomBaenAnnotation(value = "媒体链条附件") private String mediaLink; + /** + * 检测照片附件 + */ + @CustomBaenAnnotation(value = "检测照片附件") + private String detectPicAttr; + /** * 状态 */ @@ -264,4 +270,5 @@ public class ConPurchaseBo extends BaseEntity { private String isOverdue; + } diff --git a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java index 2503e49..216f6a2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/contract/domain/vo/ConSaleMediaVo.java @@ -166,12 +166,24 @@ public class ConSaleMediaVo { /** * 其他返点 */ - @ExcelProperty(value = "其他返点") + @ExcelProperty(value = "其他返点1") private String otherReverPoit; /** * 其他返点金额 */ - @ExcelProperty(value = "其他返点金额") + @ExcelProperty(value = "其他返点金额1") private Double otherReverMoney; + + /** + * 其他返点2 + */ + @ExcelProperty(value = "其他返点2") + private String otherReverPoit2; + + /** + * 其他返点金额2 + */ + @ExcelProperty(value = "其他返点金额2") + private Double otherReverMoney2; } diff --git a/script/sql/update/update_2025-1018.sql b/script/sql/update/update_2025-1018.sql new file mode 100644 index 0000000..ecef7fb --- /dev/null +++ b/script/sql/update/update_2025-1018.sql @@ -0,0 +1,8 @@ +ALTER TABLE `con_sale_media` + ADD COLUMN `other_rever_poit2` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL COMMENT '其他返点2' AFTER `other_rever_money`, +ADD COLUMN `other_rever_money2` double NULL DEFAULT NULL COMMENT '其他返点金额2' AFTER `other_rever_poit2`; + + +-- 检测照片附件 +ALTER TABLE `con_sale` + ADD COLUMN `detect_pic_attr` varchar(2000) NULL COMMENT '检测照片附件' AFTER `media_link`;