Commit ce771e50 authored by wujipeng's avatar wujipeng
Browse files

合同添加备注和终止信息

parent bdd7d4fd
...@@ -60,4 +60,12 @@ public class ContractEntity { ...@@ -60,4 +60,12 @@ public class ContractEntity {
@ApiModelProperty(value = "剩余天数") @ApiModelProperty(value = "剩余天数")
@TableField(exist = false) @TableField(exist = false)
private Integer remainingDays; private Integer remainingDays;
@ApiModelProperty(value = "备注")
@TableField("remark")
private String remark;
@ApiModelProperty(value = "终止(0:未终止,1:已终止)")
@TableField("terminate")
private Integer terminate;
} }
...@@ -13,7 +13,9 @@ ...@@ -13,7 +13,9 @@
end_time as endTime, end_time as endTime,
renew_contract as renewContract, renew_contract as renewContract,
renew_contract_code as renewContractCode, renew_contract_code as renewContractCode,
user_id as userId user_id as userId,
remark,
terminate
from from
contract contract
where where
...@@ -34,7 +36,9 @@ ...@@ -34,7 +36,9 @@
end_time as endTime, end_time as endTime,
renew_contract as renewContract, renew_contract as renewContract,
renew_contract_code as renewContractCode, renew_contract_code as renewContractCode,
user_id as userId user_id as userId,
remark,
terminate
from from
contract contract
where where
...@@ -56,7 +60,9 @@ ...@@ -56,7 +60,9 @@
end_time as endTime, end_time as endTime,
renew_contract as renewContract, renew_contract as renewContract,
renew_contract_code as renewContractCode, renew_contract_code as renewContractCode,
user_id as userId user_id as userId,
remark,
terminate
from from
contract contract
where where
...@@ -77,7 +83,9 @@ ...@@ -77,7 +83,9 @@
end_time as endTime, end_time as endTime,
renew_contract as renewContract, renew_contract as renewContract,
renew_contract_code as renewContractCode, renew_contract_code as renewContractCode,
user_id as userId user_id as userId,
remark,
terminate
from from
contract contract
where where
......
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