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-01-20 18:12:44 +08:00
parent 58df623462 7137c616f9
commit 989dd66a20
24 changed files with 317 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproPurVo.java
View File

@ -80,7 +80,7 @@ public class LngPngApproPurVo extends com.xjrsoft.common.model.base.BaseModel{
* 采购合同名称
*/
@ApiModelProperty("采购合同名称")
private Long kpName;
private String kpName;
/**

2
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/dayPlan/vo/LngPngApproVo.java
View File

@ -102,7 +102,7 @@ public class LngPngApproVo extends com.xjrsoft.common.model.base.BaseModel{
* 交易主体名称(天然气公司/惠贸)
*/
@ApiModelProperty("交易主体名称(天然气公司/惠贸)")
private Long comName;
private String comName;
/**