From c2c20eedf76886cdddadbfd29c71b5b40d0269e8 Mon Sep 17 00:00:00 2001
From: liuxiaoquan <q8197264@126.com>
Date: Mon, 6 Mar 2023 18:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=B8=8E=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/merchant/system/Merchant.php   | 26 ----------
 app/common/model/merchant/system/Merchant.php | 51 -------------------
 .../merchant/system/MerchantApplyments.php    | 22 --------
 .../system/merchant/MerchantMargin.php        | 25 ---------
 4 files changed, 124 deletions(-)
 delete mode 100644 app/admin/controller/merchant/system/Merchant.php
 delete mode 100644 app/common/model/merchant/system/Merchant.php
 delete mode 100644 app/common/model/merchant/system/MerchantApplyments.php
 delete mode 100644 app/common/model/merchant/system/merchant/MerchantMargin.php

diff --git a/app/admin/controller/merchant/system/Merchant.php b/app/admin/controller/merchant/system/Merchant.php
deleted file mode 100644
index 3b67d20..0000000
--- a/app/admin/controller/merchant/system/Merchant.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- *  表单页面
- * 
- */
-namespace app\admin\controller\merchant\system;
-
-use app\admin\BaseController;
-
-class Merchant extends BaseController{
-
-    protected $model;
-
-    public function __construct()
-    {
-    }
-
-    function classify(){
-        
-    }
-
-    public function system() {
-        
-    }
-
-}
\ No newline at end of file
diff --git a/app/common/model/merchant/system/Merchant.php b/app/common/model/merchant/system/Merchant.php
deleted file mode 100644
index 0078b08..0000000
--- a/app/common/model/merchant/system/Merchant.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * @usage 商户管理
- * @ 
- * @author 刘孝全
- */
-namespace app\common\model\merchant\system;
-use think\model;
-use think\facade\Db;
-
-/**
- * 商户管理model
- */
-class Merchant extends Model
-{
-    /**
-     * 店铺类型.
-     * 
-     *@param int $page 当前页数
-     *@param int $limit 获取记录行数
-     * 
-     *@return Array $list
-     */
-    public function GetType($offset,$limit){
-        $rows = empty($limit) ? get_config('app . page_size') : $limit;
-
-        $where = [];
-        $list = self::where($where)
-        ->field('id,user_id,title,content,create_time,status,is_read,read_time')
-        ->page($offset)
-        ->limit($limit)
-        ->select();
-
-		return $list;
-    }
-
-    /**
-     * @ 店铺类型说明
-     * 
-     * return string
-     */
-    public function GetDescription(){}
-
-    /**
-     * @ 店铺保证金
-     * 
-     * return list
-     */
-    public function Getdeposit(){}
-
-}
\ No newline at end of file
diff --git a/app/common/model/merchant/system/MerchantApplyments.php b/app/common/model/merchant/system/MerchantApplyments.php
deleted file mode 100644
index 620fcb8..0000000
--- a/app/common/model/merchant/system/MerchantApplyments.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-declare (strict_types = 1);
-
-namespace app\common\model\merchant\system;
-
-use think\Model;
-
-/**
- * @mixin \think\Model
- */
-class MerchantApplyments extends Model
-{
-    protected $table = "eb_merchant_intention";
-
-    function __construct(){}
-
-    function GetList(){
-        $list = self::where()->select();
-
-        return $list;
-    }
-}
diff --git a/app/common/model/merchant/system/merchant/MerchantMargin.php b/app/common/model/merchant/system/merchant/MerchantMargin.php
deleted file mode 100644
index 3860102..0000000
--- a/app/common/model/merchant/system/merchant/MerchantMargin.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * 店铺保证金model
- * 
- * @author：刘孝全
- * @email：q8197264@126.com
- * @date ：2023年03月3日
- */
-namespace app\common\model\merchant\system\merchant;
-
-use think\Model;
-
-class MerchantMargin extends Model
-{
-    protected $connection = 'shop';
-    protected $table = '';
-
-    function GetList() 
-    {
-        $list = self::select();
-
-        return $list;
-    }
-}
-