diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java b/backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java index f8af6885f..c45e0b793 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java @@ -103,6 +103,6 @@ public enum FieldType { /** * 子表-产品, 子表-价格 */ - SUB_PRODUCT, - SUB_PRICE; + PRODUCT_TABLE, + PRICE_TABLE; } diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java index 69a8b7116..0bb76c00e 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; @Data -@JsonTypeName("SUB_PRICE") +@JsonTypeName("PRICE_TABLE") @EqualsAndHashCode(callSuper = true) public class PriceSubField extends SubField { diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java index 1da6c1501..f393acab6 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java @@ -14,7 +14,7 @@ * @author song-cc-rock */ @Data -@JsonTypeName(value = "SUB_PRODUCT") +@JsonTypeName(value = "PRODUCT_TABLE") @EqualsAndHashCode(callSuper = true) public class ProductSubField extends SubField { diff --git a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java index 23aca14fc..fa51431cb 100644 --- a/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java +++ b/backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java @@ -42,8 +42,8 @@ @JsonSubTypes.Type(value = AttachmentField.class, name = "ATTACHMENT"), @JsonSubTypes.Type(value = LinkField.class, name = "LINK"), @JsonSubTypes.Type(value = IndustryField.class, name = "INDUSTRY"), - @JsonSubTypes.Type(value = ProductSubField.class, name = "SUB_PRODUCT"), - @JsonSubTypes.Type(value = PriceSubField.class, name = "SUB_PRICE"), + @JsonSubTypes.Type(value = ProductSubField.class, name = "PRODUCT_TABLE"), + @JsonSubTypes.Type(value = PriceSubField.class, name = "PRICE_TABLE"), @JsonSubTypes.Type(value = FormulaField.class, name = "FORMULA"), }) public abstract class BaseField { diff --git a/backend/crm/src/main/resources/form/field.json b/backend/crm/src/main/resources/form/field.json index 41ee09f40..5b00ccb59 100644 --- a/backend/crm/src/main/resources/form/field.json +++ b/backend/crm/src/main/resources/form/field.json @@ -973,7 +973,7 @@ { "name": "产品信息", "internalKey": "priceProducts", - "type": "SUB_PRODUCT", + "type": "PRODUCT_TABLE", "showLabel": true, "readable": true, "editable": true, @@ -1131,7 +1131,7 @@ { "name": "报价产品", "internalKey": "quotationProducts", - "type": "SUB_PRICE", + "type": "PRICE_TABLE", "showLabel": true, "readable": true, "editable": true,