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

Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev

Browse Source 
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java
This commit is contained in:
张秉卓
2026-01-06 10:18:08 +08:00
parent 005119b53e 3d26c74d9a
commit c4b28037f0
41 changed files with 3235 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/dto/UpdateLngCustomerDto.java
View File

@ -334,4 +334,11 @@ public class UpdateLngCustomerDto implements Serializable {
*/
@ApiModelProperty("数据权限id")
private Long ruleUserId;
/**
* 是否基础设施使用方
*/
@LogField(name="是否基础设施使用方",index=31)
@ApiModelProperty("是否基础设施使用方")
private String facSign;
}

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

@ -76,7 +76,7 @@ public class LngCustomerPageVo {
*/
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
//@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
@Trans(type = TransType.DIC, id = "1990669393069129729")
@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
private String approCode;
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")

8
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngCustomerVo.java
View File

@ -4,6 +4,7 @@ import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
import com.pictc.annotations.datalog.LogField;
import com.xjrsoft.module.system.vo.LngFileUploadVo;
import io.swagger.annotations.ApiModelProperty;
@ -276,7 +277,12 @@ public class LngCustomerVo {
@ApiModelProperty("数据权限id")
private Long ruleUserId;
/**
* 是否基础设施使用方
*/
@LogField(name="是否基础设施使用方",index=31)
@ApiModelProperty("是否基础设施使用方")
private String facSign;
/**

14
itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/sales/vo/LngScorePageVo.java
View File

@ -59,12 +59,16 @@ public class LngScorePageVo {
*/
@ApiModelProperty("分数")
private BigDecimal score;
/**
* 审批状态(未审批/审批中/已审批/已驳回)
*/
@ApiModelProperty("审批状态(未审批/审批中/已审批/已驳回)")
@Trans(type = TransType.DIC, id = "1990669393069129729")
private String approCode;
* 状态(未提交/审批中/已审批/已驳回)
*/
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
@Trans(type = TransType.DIC, id = "1990669393069129729", transToFieldName = "approName")
private String approCode;
@ApiModelProperty("状态(未提交/审批中/已审批/已驳回)")
private String approName;
/**
* 备注
*/