Merge remote-tracking branch 'origin/dev' into dev

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractSalesPngDto.java

@@ -64,4 +64,8 @@ public class UpdateLngContractSalesPngDto extends BaseModel implements Serializa
     @LogField(name="备注",index=5)
     @ApiModelProperty("备注")
     private String note;
+
+    @LogField(name="长协/现货/年度合同",index=6)
+    @ApiModelProperty("长协/现货/年度合同")
+    private String longSpotCode;
 }

itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractSalesPngVo.java

@@ -1,5 +1,7 @@
 package com.xjrsoft.module.contract.vo;
 
+import com.xjrsoft.common.annotation.Trans;
+import com.xjrsoft.common.enums.TransType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -62,6 +64,14 @@ public class LngContractSalesPngVo {
     private String note;
 
 
+    /**
+     * 长协/现货/年度合同(长协/现货/年度……)
+     */
+    @Trans(type = TransType.DIC, id = "1980562721538633730",transToFieldName = "longSpotName")
+    private String longSpotCode;
+    private String longSpotName;
+    
+    
     /**
     * 创建人id
     */

itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractSalesPng.java

@@ -61,6 +61,13 @@ public class LngContractSalesPng implements Serializable {
     private String note;
 
 
+    /**
+     * 长协/现货/年度合同(长协/现货/年度……)
+     */
+    @ApiModelProperty("长协/现货/年度合同(长协/现货/年度……)")
+    private String longSpotCode;
+   
+    
     /**
     * 创建人id
     */