Merge branch 'developer' into 'master'

feat:任务

See merge request !153

haoban-manage3-service/src/main/resources/mapper/PendingTaskMapper.xml

@@ -334,15 +334,14 @@
     </update>
 
     <insert id="insertBatch" >
-        insert into tab_haoban_pending_task ( enterprise_id, relation_id,
-          task_type, title, description,
+        insert into tab_haoban_pending_task ( enterprise_id, relation_id,business_id, task_type, title, description,
           task_status_flag, overdue_time, invalid_time,
           store_id, clerk_id, finish_time,
           finish_flag, overdue_flag, delete_flag,
           create_time, update_time)
         values
         <foreach collection="list" item="item" separator=",">
-            ( #{item.enterpriseId,jdbcType=VARCHAR}, #{item.relationId,jdbcType=VARCHAR},
+            ( #{item.enterpriseId,jdbcType=VARCHAR}, #{item.relationId,jdbcType=VARCHAR},#{item.businessId,jdbcType=VARCHAR},
             #{item.taskType,jdbcType=INTEGER}, #{item.title,jdbcType=VARCHAR}, #{item.description,jdbcType=VARCHAR},
             0, #{item.overdueTime,jdbcType=TIMESTAMP}, #{item.invalidTime,jdbcType=TIMESTAMP},
             #{item.storeId,jdbcType=VARCHAR}, #{item.clerkId,jdbcType=VARCHAR}, #{item.finishTime,jdbcType=TIMESTAMP},