Skip to content

Commit f4795d9

Browse files
song-cc-rockfit2-zhao
authored andcommitted
feat: Rename sub type
1 parent 009d8bd commit f4795d9

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,6 @@ public enum FieldType {
103103
/**
104104
* 子表-产品, 子表-价格
105105
*/
106-
SUB_PRODUCT,
107-
SUB_PRICE;
106+
PRODUCT_TABLE,
107+
PRICE_TABLE;
108108
}

backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import lombok.EqualsAndHashCode;
77

88
@Data
9-
@JsonTypeName("SUB_PRICE")
9+
@JsonTypeName("PRICE_TABLE")
1010
@EqualsAndHashCode(callSuper = true)
1111
public class PriceSubField extends SubField {
1212

backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author song-cc-rock
1515
*/
1616
@Data
17-
@JsonTypeName(value = "SUB_PRODUCT")
17+
@JsonTypeName(value = "PRODUCT_TABLE")
1818
@EqualsAndHashCode(callSuper = true)
1919
public class ProductSubField extends SubField {
2020

backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
@JsonSubTypes.Type(value = AttachmentField.class, name = "ATTACHMENT"),
4343
@JsonSubTypes.Type(value = LinkField.class, name = "LINK"),
4444
@JsonSubTypes.Type(value = IndustryField.class, name = "INDUSTRY"),
45-
@JsonSubTypes.Type(value = ProductSubField.class, name = "SUB_PRODUCT"),
46-
@JsonSubTypes.Type(value = PriceSubField.class, name = "SUB_PRICE"),
45+
@JsonSubTypes.Type(value = ProductSubField.class, name = "PRODUCT_TABLE"),
46+
@JsonSubTypes.Type(value = PriceSubField.class, name = "PRICE_TABLE"),
4747
@JsonSubTypes.Type(value = FormulaField.class, name = "FORMULA"),
4848
})
4949
public abstract class BaseField {

backend/crm/src/main/resources/form/field.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -973,7 +973,7 @@
973973
{
974974
"name": "产品信息",
975975
"internalKey": "priceProducts",
976-
"type": "SUB_PRODUCT",
976+
"type": "PRODUCT_TABLE",
977977
"showLabel": true,
978978
"readable": true,
979979
"editable": true,
@@ -1131,7 +1131,7 @@
11311131
{
11321132
"name": "报价产品",
11331133
"internalKey": "quotationProducts",
1134-
"type": "SUB_PRICE",
1134+
"type": "PRICE_TABLE",
11351135
"showLabel": true,
11361136
"readable": true,
11371137
"editable": true,

0 commit comments

Comments
 (0)