1

.idea/workspace.xml

@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="b5852db3-28ab-419d-82cf-b6c0f6b99397" name="变更" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Http/Controllers/Api/MeasureController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/Api/MeasureController.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/Service/MaterialService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/MaterialService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/MeasureService.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/MeasureService.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/Service/Service.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Service/Service.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -149,7 +145,7 @@
       <workItem from="1685595177391" duration="2533000" />
       <workItem from="1685669123669" duration="2439000" />
       <workItem from="1685952381761" duration="726000" />
-      <workItem from="1686021203384" duration="8475000" />
+      <workItem from="1686021203384" duration="8712000" />
     </task>
     <servers />
   </component>

app/Service/MaterialService.php

@@ -40,7 +40,7 @@ class MaterialService extends Service
 
     public function basicMaterialList($data){
         $list = BasicMaterial::where('del_time',0)
-            ->select('title','crt_time','upd_time','id')
+            ->select('title','crt_time','upd_time','id','parent_id')
             ->orderBy('id','desc');
 
         $list = $this->limit($list,'',$data);