ceshi wode jiaolian

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/portal/controller/ToolController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/ToolController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,8 +20,8 @@
       <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="720">
-              <caret line="447" column="23" selection-start-line="447" selection-start-column="23" selection-end-line="447" selection-end-column="23" />
+            <state relative-caret-position="468">
+              <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
               <folding>
                 <element signature="e#911#990#0#PHP" />
                 <element signature="e#1015#1432#0#PHP" />
@@ -238,7 +237,7 @@
       <workItem from="1535458114609" duration="13848000" />
       <workItem from="1535514127808" duration="727000" />
       <workItem from="1535532970259" duration="2527000" />
-      <workItem from="1535546044129" duration="461000" />
+      <workItem from="1535546044129" duration="1063000" />
     </task>
     <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
       <created>1535458170068</created>
@@ -338,11 +337,25 @@
       <option name="project" value="LOCAL" />
       <updated>1535534252730</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="ceshi wode jiaolian">
+      <created>1535546534569</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1535546534569</updated>
+    </task>
+    <task id="LOCAL-00016" summary="ceshi wode jiaolian">
+      <created>1535546965523</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1535546965523</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="34099000" />
+    <option name="totallyTimeSpent" value="34701000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -382,7 +395,8 @@
     <MESSAGE value="已经成功报名的用户，不能再次报名  放在确认订单页面" />
     <MESSAGE value="已评价无数据情况" />
     <MESSAGE value="取消预约短信" />
-    <option name="LAST_COMMIT_MESSAGE" value="取消预约短信" />
+    <MESSAGE value="ceshi wode jiaolian" />
+    <option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/api/portal/route.php">
@@ -706,8 +720,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="447" column="23" selection-start-line="447" selection-start-column="23" selection-end-line="447" selection-end-column="23" />
+        <state relative-caret-position="468">
+          <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
           <folding>
             <element signature="e#911#990#0#PHP" />
             <element signature="e#1015#1432#0#PHP" />

@@ -442,8 +442,7 @@ class YuyueController extends UserBaseController
             ->order('create_time desc')
             ->select()
             ->toArray();
-        echo Db::name('yuyue')->getLastSql();
-        print_r($data);
+
 
         $data1 = Db::name('yuyue')
             ->alias('yy')