geg-gas/geg-gas-pcitc
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
shunyi.kuang
2026-04-02 17:49:05 +08:00
parent aba85baf06 488aec478a
commit dcc8d621e2
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

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

@ -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;
@ -60,6 +62,14 @@ public class LngContractSalesPngVo {
*/
@ApiModelProperty("备注")
private String note;
/**
* 长协/现货/年度合同(长协/现货/年度……)
*/
@Trans(type = TransType.DIC, id = "1980562721538633730",transToFieldName = "longSpotName")
private String longSpotCode;
private String longSpotName;
/**