解决冲突
This commit is contained in:
parent
a427b35865
commit
68951aabaf
|
@ -1,35 +1,9 @@
|
|||
<?php
|
||||
<<<<<<< HEAD
|
||||
|
||||
namespace app\common\model\land;
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
|
||||
class Land extends BaseModel
|
||||
{
|
||||
|
||||
}
|
||||
=======
|
||||
// +----------------------------------------------------------------------
|
||||
// | likeadmin快速开发前后端分离管理后台(PHP版)
|
||||
// +----------------------------------------------------------------------
|
||||
// | 欢迎阅读学习系统程序代码,建议反馈是我们前进的动力
|
||||
// | 开源版本可自由商用,可去除界面版权logo
|
||||
// | gitee下载:https://gitee.com/likeshop_gitee/likeadmin
|
||||
// | github下载:https://github.com/likeshop-github/likeadmin
|
||||
// | 访问官网:https://www.likeadmin.cn
|
||||
// | likeadmin团队 版权所有 拥有最终解释权
|
||||
// +----------------------------------------------------------------------
|
||||
// | author: likeadminTeam
|
||||
// +----------------------------------------------------------------------
|
||||
|
||||
namespace app\common\model\land;
|
||||
|
||||
|
||||
use app\common\model\BaseModel;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Land模型
|
||||
* Class Land
|
||||
|
@ -40,7 +14,4 @@ class Land extends BaseModel
|
|||
|
||||
protected $name = 'land';
|
||||
|
||||
|
||||
|
||||
}
|
||||
>>>>>>> yaooo
|
||||
|
|
Loading…
Reference in New Issue