Commit 323041e6 by lzxry

mysql5.7关键字冲突virtual

parent d8c540cc
......@@ -53,7 +53,7 @@ public class Contract {
private Date modifyTime;
private Date createTime;
private String ds;
private Boolean virtual;
private Boolean virtualFlag;
private Long firstBackId;//先回款记录的id
......@@ -126,12 +126,12 @@ public class Contract {
this.id = id;
}
public Boolean getVirtual() {
return virtual;
public Boolean getVirtualFlag() {
return virtualFlag;
}
public void setVirtual(Boolean virtual) {
this.virtual = virtual;
public void setVirtualFlag(Boolean virtualFlag) {
this.virtualFlag = virtualFlag;
}
public Long getFirstBackId() {
......@@ -747,7 +747,7 @@ public class Contract {
", modifyTime=" + modifyTime +
", createTime=" + createTime +
", ds='" + ds + '\'' +
", virtual=" + virtual +
", virtualFlag=" + virtualFlag +
", firstBackId=" + firstBackId +
", adjustmentFund=" + adjustmentFund +
", adjustmentFundForm='" + adjustmentFundForm + '\'' +
......
......@@ -501,7 +501,7 @@ public class ContractServiceImpl implements ContractService {
if (null != user) {
contract.setSale(user.getId());
}
contract.setVirtual(true);
contract.setVirtualFlag(true);
Account account = accountRepository.findByEmail(contract.getEmail());
contract.setCustomerBody(account.getCompany());
contract.setType("increment");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment