Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-27 92bc6dca274eb45dc330f63b5a3f90a01458e157

 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/vo/ParaCommonToolVo.java

@@ -6,6 +6,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;

import java.io.Serializable;

@@ -56,7 +57,9 @@
    private String positionCode;

    @ApiModelProperty(value = "工具类型;1.通用 2.专用")
    @Dict(dicCode = "application_type")
    private String applicationType;
    private String applicationTypeName;

    @ApiModelProperty(value = "厂家")
    private String supplierId;