Skip to content

feat: Rename sub type #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fit2-zhao merged 1 commit into from
Nov 25, 2025
Merged

feat: Rename sub type #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/crm/system/constants/FieldType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ public enum FieldType {
/**
* 子表-产品, 子表-价格
*/
SUB_PRODUCT,
SUB_PRICE;
PRODUCT_TABLE,
PRICE_TABLE;
}
2 changes: 1 addition & 1 deletion backend/crm/src/main/java/cn/cordys/crm/system/dto/field/PriceSubField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import lombok.EqualsAndHashCode;

@Data
@JsonTypeName("SUB_PRICE")
@JsonTypeName("PRICE_TABLE")
@EqualsAndHashCode(callSuper = true)
public class PriceSubField extends SubField {

Expand Down
2 changes: 1 addition & 1 deletion backend/crm/src/main/java/cn/cordys/crm/system/dto/field/ProductSubField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions backend/crm/src/main/java/cn/cordys/crm/system/dto/field/base/BaseField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions backend/crm/src/main/resources/form/field.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,7 @@
{
"name": "产品信息",
"internalKey": "priceProducts",
"type": "SUB_PRODUCT",
"type": "PRODUCT_TABLE",
"showLabel": true,
"readable": true,
"editable": true,
Expand Down Expand Up @@ -1131,7 +1131,7 @@
{
"name": "报价产品",
"internalKey": "quotationProducts",
"type": "SUB_PRICE",
"type": "PRICE_TABLE",
"showLabel": true,
"readable": true,
"editable": true,
Expand Down
Loading