gx

@@ -14,10 +14,7 @@ use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Http\Logic\Bside\CustomModule\CustomModuleExtendLogic;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtend;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
-<<<<<<< HEAD
 use App\Models\Product\Extend;
 use App\Models\Product\Extend;
-=======
->>>>>>> 8cd12bff1a9683bab5e510abdf95218a42999a27
 
 
 class CustomModuleExtentController extends BaseController
 class CustomModuleExtentController extends BaseController
 {
 {
@@ -87,7 +84,6 @@ class CustomModuleExtentController extends BaseController
     }
     }
 
 
     /**
     /**
-<<<<<<< HEAD
      * @remark :获取扩展模块的扩展字段
      * @remark :获取扩展模块的扩展字段
      * @name   :lists
      * @name   :lists
      * @author :lyh
      * @author :lyh
@@ -104,17 +100,4 @@ class CustomModuleExtentController extends BaseController
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
 
 
-=======
-     * @remark :
-     * @name   :getExtendContentList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/20 15:21
-     */
-    public function getExtendContentList(){
-        $extendContentModel = new CustomModuleExtentContent();
-        $lists = $extend->list($this->map);
-        $this->response('success',Code::SUCCESS,$lists);
-    }
->>>>>>> 8cd12bff1a9683bab5e510abdf95218a42999a27
 }
 }