外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 a0be09f5768932ec3eb2f5d4a1b179b20a19a6cf 1 个父辈 a50b709c

ceshi wode jiaolian

内嵌 并排对比
正在显示 2 个修改的文件 包含 24 行增加 和 11 行删除
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/app/portal/controller/ToolController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/ToolController.php" afterDir="false" />  
7 <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
8 </list> 7 </list>
9 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,8 +20,8 @@ @@ -21,8 +20,8 @@
21 <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true"> 20 <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
22 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 21 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
23 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
24 - <state relative-caret-position="720">  
25 - <caret line="447" column="23" selection-start-line="447" selection-start-column="23" selection-end-line="447" selection-end-column="23" /> 23 + <state relative-caret-position="468">
  24 + <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
26 <folding> 25 <folding>
27 <element signature="e#911#990#0#PHP" /> 26 <element signature="e#911#990#0#PHP" />
28 <element signature="e#1015#1432#0#PHP" /> 27 <element signature="e#1015#1432#0#PHP" />
@@ -238,7 +237,7 @@ @@ -238,7 +237,7 @@
238 <workItem from="1535458114609" duration="13848000" /> 237 <workItem from="1535458114609" duration="13848000" />
239 <workItem from="1535514127808" duration="727000" /> 238 <workItem from="1535514127808" duration="727000" />
240 <workItem from="1535532970259" duration="2527000" /> 239 <workItem from="1535532970259" duration="2527000" />
241 - <workItem from="1535546044129" duration="461000" /> 240 + <workItem from="1535546044129" duration="1063000" />
242 </task> 241 </task>
243 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 242 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
244 <created>1535458170068</created> 243 <created>1535458170068</created>
@@ -338,11 +337,25 @@ @@ -338,11 +337,25 @@
338 <option name="project" value="LOCAL" /> 337 <option name="project" value="LOCAL" />
339 <updated>1535534252730</updated> 338 <updated>1535534252730</updated>
340 </task> 339 </task>
341 - <option name="localTasksCounter" value="15" /> 340 + <task id="LOCAL-00015" summary="ceshi wode jiaolian">
  341 + <created>1535546534569</created>
  342 + <option name="number" value="00015" />
  343 + <option name="presentableId" value="LOCAL-00015" />
  344 + <option name="project" value="LOCAL" />
  345 + <updated>1535546534569</updated>
  346 + </task>
  347 + <task id="LOCAL-00016" summary="ceshi wode jiaolian">
  348 + <created>1535546965523</created>
  349 + <option name="number" value="00016" />
  350 + <option name="presentableId" value="LOCAL-00016" />
  351 + <option name="project" value="LOCAL" />
  352 + <updated>1535546965523</updated>
  353 + </task>
  354 + <option name="localTasksCounter" value="17" />
342 <servers /> 355 <servers />
343 </component> 356 </component>
344 <component name="TimeTrackingManager"> 357 <component name="TimeTrackingManager">
345 - <option name="totallyTimeSpent" value="34099000" /> 358 + <option name="totallyTimeSpent" value="34701000" />
346 </component> 359 </component>
347 <component name="ToolWindowManager"> 360 <component name="ToolWindowManager">
348 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 361 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -382,7 +395,8 @@ @@ -382,7 +395,8 @@
382 <MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" /> 395 <MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
383 <MESSAGE value="已评价无数据情况" /> 396 <MESSAGE value="已评价无数据情况" />
384 <MESSAGE value="取消预约短信" /> 397 <MESSAGE value="取消预约短信" />
385 - <option name="LAST_COMMIT_MESSAGE" value="取消预约短信" /> 398 + <MESSAGE value="ceshi wode jiaolian" />
  399 + <option name="LAST_COMMIT_MESSAGE" value="ceshi wode jiaolian" />
386 </component> 400 </component>
387 <component name="editorHistoryManager"> 401 <component name="editorHistoryManager">
388 <entry file="file://$PROJECT_DIR$/api/portal/route.php"> 402 <entry file="file://$PROJECT_DIR$/api/portal/route.php">
@@ -706,8 +720,8 @@ @@ -706,8 +720,8 @@
706 </entry> 720 </entry>
707 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 721 <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
708 <provider selected="true" editor-type-id="text-editor"> 722 <provider selected="true" editor-type-id="text-editor">
709 - <state relative-caret-position="720">  
710 - <caret line="447" column="23" selection-start-line="447" selection-start-column="23" selection-end-line="447" selection-end-column="23" /> 723 + <state relative-caret-position="468">
  724 + <caret line="444" lean-forward="true" selection-start-line="444" selection-end-line="444" />
711 <folding> 725 <folding>
712 <element signature="e#911#990#0#PHP" /> 726 <element signature="e#911#990#0#PHP" />
713 <element signature="e#1015#1432#0#PHP" /> 727 <element signature="e#1015#1432#0#PHP" />
@@ -442,8 +442,7 @@ class YuyueController extends UserBaseController @@ -442,8 +442,7 @@ class YuyueController extends UserBaseController
442 ->order('create_time desc') 442 ->order('create_time desc')
443 ->select() 443 ->select()
444 ->toArray(); 444 ->toArray();
445 - echo Db::name('yuyue')->getLastSql();  
446 - print_r($data); 445 +
447 446
448 $data1 = Db::name('yuyue') 447 $data1 = Db::name('yuyue')
449 ->alias('yy') 448 ->alias('yy')