解决冲突

app/Models/Ledger.php

@@ -49,12 +49,20 @@ class Ledger extends Model
         return $this->hasMany(LedgerItem::class);
     }
 
+<<<<<<< Updated upstream
     /**
      * 是否允许重新上报
      */
     public function allowReReport(): bool
     {
         return is_null($this->ledger_amount) && is_null($this->actual_commission) && is_null($this->actual_income);
+=======
+    public function canReport(): bool
+    {
+        return is_null($this->ledger_amount)
+            && is_null($this->actual_commission)
+            && is_null($this->actual_income);
+>>>>>>> Stashed changes
     }
 
     protected function ledgerDifference(): Attribute

routes/api.php

@@ -3,8 +3,13 @@
 use App\Http\Controllers\Api\Auth\AccessTokenController;
 use App\Http\Controllers\Api\ComplaintController;
 use App\Http\Controllers\Api\FeedbackController;
+<<<<<<< Updated upstream
 use App\Http\Controllers\Api\Ledger\LedgerController;
 use App\Http\Controllers\Api\Ledger\LotteryTypeController;
+=======
+use App\Http\Controllers\Api\LedgerController;
+use App\Http\Controllers\Api\LotteryTypeController;
+>>>>>>> Stashed changes
 use App\Http\Controllers\Api\StatsController;
 use Illuminate\Support\Facades\Route;
 
@@ -23,11 +28,18 @@ Route::group([
 
     Route::get('/stats/dashboard', [StatsController::class, 'dashboard']);
 
+<<<<<<< Updated upstream
     // 数据上报
     Route::post('/ledger/ledgers', [LedgerController::class, 'store']);
     Route::get('/ledger/ledgers/{date}', [LedgerController::class, 'show']);
     Route::get('/ledger/lottery-types', [LotteryTypeController::class, 'index']);
 
+=======
+    Route::resource('/ledger', LedgerController::class)->only(['store', 'show']);
+
+    // 彩种类型
+    Route::get('lottery-types', [LotteryTypeController::class, 'index']);
+>>>>>>> Stashed changes
     // 举报投诉
     Route::post('complaints', [ComplaintController::class, 'store']);
     // 意见箱