Merge branch 'master' of http://gogs.renlianiot.com:4000/zmcoding/smart-tool-api

catch/hydraulic/database/migrations/20220505112140_hydraulic_add_fields.php

@@ -11,7 +11,7 @@
 
 use think\migration\Migrator;
 use think\migration\db\Column;
-
+use Phinx\Db\Adapter\MysqlAdapter;
 class HydraulicAddFields extends Migrator
 {
     /**
@@ -42,6 +42,9 @@ class HydraulicAddFields extends Migrator
 
             $table  ->addColumn('imei', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => 'imei号',])
                     ->addColumn('sim_card', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => 'sim卡号',])
+                    ->addColumn('check_time', 'integer', ['limit' => MysqlAdapter::INT_REGULAR,'null' => true,'default' => null,'signed' => true,'comment' => '校验时间',])
+                    ->addColumn('effective_period', 'string', ['limit' => 8,'null' => true,'signed' => true,'comment' => '有效周期',])
+                    ->addColumn('effective_time', 'string', ['limit' => 32,'null' => true,'signed' => true,'comment' => '有效截止时间',])
                     ->update();
         }
       

catch/hydraulic/model/Hydraulic.php

@@ -59,7 +59,10 @@ class Hydraulic extends Model
         'max_pressure',
         'min_pressure',
         'imei',
-        'sim_card'
+        'sim_card',
+        'effective_time',
+        'effective_period',
+        'check_time',
     );
      /**
      * 获取列表