王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 10c81c0e2887d894f512d45ed2bdbd28432e7d6f 1 个父辈 204e0571
1 个管道 的构建 通过 耗费 0 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 58 行增加 和 57 行删除
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 </component> 5 </component>
6 <component name="ChangeListManager"> 6 <component name="ChangeListManager">
7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment=""> 7 <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
  8 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8 <change beforePath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" afterDir="false" />
9 </list> 10 </list>
10 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -84,8 +85,8 @@ @@ -84,8 +85,8 @@
84 <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true"> 85 <file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
85 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php"> 86 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
86 <provider selected="true" editor-type-id="text-editor"> 87 <provider selected="true" editor-type-id="text-editor">
87 - <state relative-caret-position="323">  
88 - <caret line="91" column="15" selection-start-line="91" selection-start-column="15" selection-end-line="91" selection-end-column="15" /> 88 + <state relative-caret-position="697">
  89 + <caret line="155" column="9" selection-start-line="155" selection-start-column="9" selection-end-line="155" selection-end-column="9" />
89 </state> 90 </state>
90 </provider> 91 </provider>
91 </entry> 92 </entry>
@@ -517,56 +518,7 @@ @@ -517,56 +518,7 @@
517 <workItem from="1573000530976" duration="6061000" /> 518 <workItem from="1573000530976" duration="6061000" />
518 <workItem from="1573087576825" duration="5555000" /> 519 <workItem from="1573087576825" duration="5555000" />
519 <workItem from="1573174620844" duration="32581000" /> 520 <workItem from="1573174620844" duration="32581000" />
520 - <workItem from="1573259331081" duration="29290000" />  
521 - </task>  
522 - <task id="LOCAL-00487" summary="商户申请">  
523 - <created>1573281203802</created>  
524 - <option name="number" value="00487" />  
525 - <option name="presentableId" value="LOCAL-00487" />  
526 - <option name="project" value="LOCAL" />  
527 - <updated>1573281203802</updated>  
528 - </task>  
529 - <task id="LOCAL-00488" summary="商户申请">  
530 - <created>1573281257052</created>  
531 - <option name="number" value="00488" />  
532 - <option name="presentableId" value="LOCAL-00488" />  
533 - <option name="project" value="LOCAL" />  
534 - <updated>1573281257052</updated>  
535 - </task>  
536 - <task id="LOCAL-00489" summary="商户申请">  
537 - <created>1573281301831</created>  
538 - <option name="number" value="00489" />  
539 - <option name="presentableId" value="LOCAL-00489" />  
540 - <option name="project" value="LOCAL" />  
541 - <updated>1573281301831</updated>  
542 - </task>  
543 - <task id="LOCAL-00490" summary="商户申请">  
544 - <created>1573281402460</created>  
545 - <option name="number" value="00490" />  
546 - <option name="presentableId" value="LOCAL-00490" />  
547 - <option name="project" value="LOCAL" />  
548 - <updated>1573281402460</updated>  
549 - </task>  
550 - <task id="LOCAL-00491" summary="商户申请">  
551 - <created>1573281450641</created>  
552 - <option name="number" value="00491" />  
553 - <option name="presentableId" value="LOCAL-00491" />  
554 - <option name="project" value="LOCAL" />  
555 - <updated>1573281450641</updated>  
556 - </task>  
557 - <task id="LOCAL-00492" summary="商户申请">  
558 - <created>1573282509004</created>  
559 - <option name="number" value="00492" />  
560 - <option name="presentableId" value="LOCAL-00492" />  
561 - <option name="project" value="LOCAL" />  
562 - <updated>1573282509004</updated>  
563 - </task>  
564 - <task id="LOCAL-00493" summary="商户申请">  
565 - <created>1573282874123</created>  
566 - <option name="number" value="00493" />  
567 - <option name="presentableId" value="LOCAL-00493" />  
568 - <option name="project" value="LOCAL" />  
569 - <updated>1573282874123</updated> 521 + <workItem from="1573259331081" duration="29618000" />
570 </task> 522 </task>
571 <task id="LOCAL-00494" summary="商户申请"> 523 <task id="LOCAL-00494" summary="商户申请">
572 <created>1573282924950</created> 524 <created>1573282924950</created>
@@ -862,11 +814,60 @@ @@ -862,11 +814,60 @@
862 <option name="project" value="LOCAL" /> 814 <option name="project" value="LOCAL" />
863 <updated>1573292751851</updated> 815 <updated>1573292751851</updated>
864 </task> 816 </task>
865 - <option name="localTasksCounter" value="536" /> 817 + <task id="LOCAL-00536" summary=" 商户申请">
  818 + <created>1573292769617</created>
  819 + <option name="number" value="00536" />
  820 + <option name="presentableId" value="LOCAL-00536" />
  821 + <option name="project" value="LOCAL" />
  822 + <updated>1573292769617</updated>
  823 + </task>
  824 + <task id="LOCAL-00537" summary=" 商户申请">
  825 + <created>1573292790408</created>
  826 + <option name="number" value="00537" />
  827 + <option name="presentableId" value="LOCAL-00537" />
  828 + <option name="project" value="LOCAL" />
  829 + <updated>1573292790408</updated>
  830 + </task>
  831 + <task id="LOCAL-00538" summary=" 商户申请">
  832 + <created>1573292821346</created>
  833 + <option name="number" value="00538" />
  834 + <option name="presentableId" value="LOCAL-00538" />
  835 + <option name="project" value="LOCAL" />
  836 + <updated>1573292821346</updated>
  837 + </task>
  838 + <task id="LOCAL-00539" summary=" 商户申请">
  839 + <created>1573292848558</created>
  840 + <option name="number" value="00539" />
  841 + <option name="presentableId" value="LOCAL-00539" />
  842 + <option name="project" value="LOCAL" />
  843 + <updated>1573292848558</updated>
  844 + </task>
  845 + <task id="LOCAL-00540" summary=" 商户申请">
  846 + <created>1573292905044</created>
  847 + <option name="number" value="00540" />
  848 + <option name="presentableId" value="LOCAL-00540" />
  849 + <option name="project" value="LOCAL" />
  850 + <updated>1573292905044</updated>
  851 + </task>
  852 + <task id="LOCAL-00541" summary=" 商户申请">
  853 + <created>1573292930415</created>
  854 + <option name="number" value="00541" />
  855 + <option name="presentableId" value="LOCAL-00541" />
  856 + <option name="project" value="LOCAL" />
  857 + <updated>1573292930415</updated>
  858 + </task>
  859 + <task id="LOCAL-00542" summary=" 商户申请">
  860 + <created>1573293077920</created>
  861 + <option name="number" value="00542" />
  862 + <option name="presentableId" value="LOCAL-00542" />
  863 + <option name="project" value="LOCAL" />
  864 + <updated>1573293077920</updated>
  865 + </task>
  866 + <option name="localTasksCounter" value="543" />
866 <servers /> 867 <servers />
867 </component> 868 </component>
868 <component name="TimeTrackingManager"> 869 <component name="TimeTrackingManager">
869 - <option name="totallyTimeSpent" value="402963000" /> 870 + <option name="totallyTimeSpent" value="403291000" />
870 </component> 871 </component>
871 <component name="ToolWindowManager"> 872 <component name="ToolWindowManager">
872 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 873 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -1274,8 +1275,8 @@ @@ -1274,8 +1275,8 @@
1274 </entry> 1275 </entry>
1275 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php"> 1276 <entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
1276 <provider selected="true" editor-type-id="text-editor"> 1277 <provider selected="true" editor-type-id="text-editor">
1277 - <state relative-caret-position="323">  
1278 - <caret line="91" column="15" selection-start-line="91" selection-start-column="15" selection-end-line="91" selection-end-column="15" /> 1278 + <state relative-caret-position="697">
  1279 + <caret line="155" column="9" selection-start-line="155" selection-start-column="9" selection-end-line="155" selection-end-column="9" />
1279 </state> 1280 </state>
1280 </provider> 1281 </provider>
1281 </entry> 1282 </entry>
@@ -154,7 +154,7 @@ class UserExpLogAudit extends Backend @@ -154,7 +154,7 @@ class UserExpLogAudit extends Backend
154 } 154 }
155 $this->error(__('Parameter %s can not be empty', '')); 155 $this->error(__('Parameter %s can not be empty', ''));
156 } 156 }
157 - echo 1; 157 + dump($row);
158 exit(); 158 exit();
159 $this->view->assign("row", $row); 159 $this->view->assign("row", $row);
160 return $this->view->fetch(); 160 return $this->view->fetch();