Merge branch 'durong' into develop

database/migrations/2019_06_14_164201_add_behavior_value_to_general_ledger_record_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddBehaviorValueToGeneralLedgerRecordTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('general_ledger_record', function (Blueprint $table) {
+            $table->tinyInteger('behavior_value')->nullable()->comment('行为值:0:未点赞(收藏);1.已点赞(收藏)');
+
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('general_ledger_record', function (Blueprint $table) {
+            //
+        });
+    }
+}

routes/api.php

@@ -101,6 +101,8 @@ $api->version('v1', [
         //行为日志列表
         $api->get('behavior/log', 'LogController@index');
 
+        //用户注册账单列表
+        $api->get('registeredRecord/list', 'RegisteredRecordController@index');
     });
 
 });