提交

application/api/controller/Approve.php

@@ -34,6 +34,7 @@ class Approve extends Base
      * @Apidoc\Returned("approve_id", type="integer", desc="审批ID")
      * @Apidoc\Returned("status", type="integer", desc="审批状态:1=待审批,2=审批中,3=审批同意,4=审批驳回")
      * @Apidoc\Returned("create_at", type="string", desc="创建时间")
+     * @Apidoc\Returned("module", type="integer", desc="模块类型")
      * @Apidoc\Returned("order_no", type="string", desc="审批编号")
      * @Apidoc\Returned("apply_date", type="string", desc="申请日期")
      * @Apidoc\Returned("reason", type="string", desc="事由,文件名称")

application/common/service/ApproveService.php

@@ -83,7 +83,7 @@ class ApproveService
         $aliasName = 'approve.';
         $jobName = 'approveInfo.';
         $field = 'id as approve_id,info_id,status,create_at';
-        $joinField = 'user_id,order_no,apply_date,reason,type,desc,start_time,end_time';
+        $joinField = 'module,user_id,order_no,apply_date,reason,type,desc,start_time,end_time';
         $field = self::getAliasField($field, $aliasName);
         $joinField = self::getAliasField($joinField, $jobName);
         $field = implode(',', array_merge($field, $joinField));