Commit 323041e6 by lzxry

mysql5.7关键字冲突virtual

parent d8c540cc
...@@ -53,7 +53,7 @@ public class Contract { ...@@ -53,7 +53,7 @@ public class Contract {
private Date modifyTime; private Date modifyTime;
private Date createTime; private Date createTime;
private String ds; private String ds;
private Boolean virtual; private Boolean virtualFlag;
private Long firstBackId;//先回款记录的id private Long firstBackId;//先回款记录的id
...@@ -126,12 +126,12 @@ public class Contract { ...@@ -126,12 +126,12 @@ public class Contract {
this.id = id; this.id = id;
} }
public Boolean getVirtual() { public Boolean getVirtualFlag() {
return virtual; return virtualFlag;
} }
public void setVirtual(Boolean virtual) { public void setVirtualFlag(Boolean virtualFlag) {
this.virtual = virtual; this.virtualFlag = virtualFlag;
} }
public Long getFirstBackId() { public Long getFirstBackId() {
...@@ -747,7 +747,7 @@ public class Contract { ...@@ -747,7 +747,7 @@ public class Contract {
", modifyTime=" + modifyTime + ", modifyTime=" + modifyTime +
", createTime=" + createTime + ", createTime=" + createTime +
", ds='" + ds + '\'' + ", ds='" + ds + '\'' +
", virtual=" + virtual + ", virtualFlag=" + virtualFlag +
", firstBackId=" + firstBackId + ", firstBackId=" + firstBackId +
", adjustmentFund=" + adjustmentFund + ", adjustmentFund=" + adjustmentFund +
", adjustmentFundForm='" + adjustmentFundForm + '\'' + ", adjustmentFundForm='" + adjustmentFundForm + '\'' +
......
...@@ -501,7 +501,7 @@ public class ContractServiceImpl implements ContractService { ...@@ -501,7 +501,7 @@ public class ContractServiceImpl implements ContractService {
if (null != user) { if (null != user) {
contract.setSale(user.getId()); contract.setSale(user.getId());
} }
contract.setVirtual(true); contract.setVirtualFlag(true);
Account account = accountRepository.findByEmail(contract.getEmail()); Account account = accountRepository.findByEmail(contract.getEmail());
contract.setCustomerBody(account.getCompany()); contract.setCustomerBody(account.getCompany());
contract.setType("increment"); 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