Explorar o código

Merge remote-tracking branch 'origin/master' into prod_test

lwhhszx hai 1 ano
pai
achega
a046ac2db8
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      src/main/resources/mapper/ImportTaskMapper.xml

+ 1 - 1
src/main/resources/mapper/ImportTaskMapper.xml

@@ -4,7 +4,7 @@
     <select id="getImportTask" resultType="cn.cslg.pas.common.vo.business.ImportTaskVO">
         select it.name as name, it.id,it.search_condition as searchCondition,it.all_num as allNum,
                it.default_num as defaultNum,it.type as type,it.create_id as
-        createId,it.create_time as createTime ,it.state as  state,it.done_num as doneNum ,itc.file_guid as fileGuid from import_task it left join import_task_condition itc on
+        createId,it.create_time as createTime ,it.state as  state,it.done_num as doneNum ,itc.file_guid as fileGuid,itc.project_type as projectType ,itc.project_id as projectId from import_task it left join import_task_condition itc on
         it.import_task_condition_id=itc.id
         <if test="sql1!=''">