Browse Source

Merge branch 'test3' into test2

anderx 1 year ago
parent
commit
aa11df3fc3
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TChangeTaskMapper.xml

@@ -367,7 +367,7 @@
 	a.official_cost officialCost, a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
 	a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
 	a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,i.patent_transfer patentTransfer,
-    i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,
+    i.type taskType, a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm,a.cost_reduction costReduction,
     a.change_split_super changeSplitSuper,a.last_year lastYear,a.last_year_income lastYearIncome,a.last_year_capital lastYearCapital
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id