Merge branch 'colonel' into develop

application/services/marketing/ColonelService.php

@@ -66,10 +66,10 @@ class ColonelService
      */
     public static function isApply(int $userId): array
     {
-        $applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId],['colonel_apply_id','audit_status']);
+        $applyInfo = ColonelDistributorColonelApply::getRecord(['user_id' => $userId], ['colonel_apply_id','audit_status']);
         return [
-            'is_apply' => !empty($applyInfo) ? 1 : 0,
-            'audit_status' => $applyInfo['audit_status']
+            // -1.未申请  0.未审核  1.审核通过  2.审核未通过
+            'apply_status' => !empty($applyInfo['audit_status']) ? intval($applyInfo['audit_status']) : -1
         ];
     }