bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
hongchao 2025-08-01 10:40:40 +08:00
parent ce0f33fb63
commit 35a42eb301
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/domain/TmTask.java
View File

@ -365,13 +365,6 @@ public class TmTask implements Serializable {
@ApiModelProperty(value = "领料id") @ApiModelProperty(value = "领料id")
private Integer leaseId; private Integer leaseId;
/**
* 备注
*/
@ApiModelProperty(value = "备注")
@Excel(name = "备注", sort = 11)
private String remarkLease;
public void setLeaseFee(BigDecimal leaseFee) { public void setLeaseFee(BigDecimal leaseFee) {
this.leaseFee = leaseFee; this.leaseFee = leaseFee;
} }

8
sgzb-modules/sgzb-material/src/main/resources/mapper/app/TmTaskMapper.xml
View File

@ -1037,7 +1037,6 @@
bui.unit_name AS unitName, bui.unit_name AS unitName,
lai.lease_person AS leasePerson, lai.lease_person AS leasePerson,
lai.phone AS leasePhone, lai.phone AS leasePhone,
lai.remark AS remarkLease,
tt.create_by AS applyFor, tt.create_by AS applyFor,
d.`name` AS taskName, d.`name` AS taskName,
lai.lease_type AS leaseType, lai.lease_type AS leaseType,
@ -1099,7 +1098,8 @@
lad.is_ct as isCt, lad.is_ct as isCt,
lad.replace_type_id as replaceTypeId, lad.replace_type_id as replaceTypeId,
lad.sets_num as setsNum, lad.sets_num as setsNum,
lad.lease_price as leasePrice lad.lease_price as leasePrice,
lad.remark as remark
FROM FROM
lease_apply_details lad lease_apply_details lad
LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id
@ -1144,7 +1144,8 @@
lad.is_ct as isCt, lad.is_ct as isCt,
lad.replace_type_id as replaceTypeId, lad.replace_type_id as replaceTypeId,
lad.sets_num as setsNum, lad.sets_num as setsNum,
lad.lease_price as leasePrice lad.lease_price as leasePrice,
lad.remark as remark
FROM FROM
lease_apply_details lad lease_apply_details lad
LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id LEFT JOIN lease_apply_info lai on lad.parennt_id = lai.id
@ -1340,7 +1341,6 @@
bui.unit_name AS unitName, bui.unit_name AS unitName,
lai.lease_person AS leasePerson, lai.lease_person AS leasePerson,
lai.phone AS leasePhone, lai.phone AS leasePhone,
lai.remark AS remarkLease,
tt.create_by AS applyFor, tt.create_by AS applyFor,
d.`name` AS taskName, d.`name` AS taskName,
lai.lease_type AS leaseType, lai.lease_type AS leaseType,