合并分支 'lyh-server' 到 'master'
gx数据 查看合并请求 !1447
正在显示
2 个修改的文件
包含
23 行增加
和
0 行删除
| @@ -36,6 +36,7 @@ class MonthReportController extends BaseController | @@ -36,6 +36,7 @@ class MonthReportController extends BaseController | ||
| 36 | $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))]; | 36 | $this->map['month'] = ['>=',date('Y-m',strtotime($this->user['uptime']))]; |
| 37 | } | 37 | } |
| 38 | $month = $monthCountModel->formatQuery($this->map)->pluck('month')->unique()->toArray(); | 38 | $month = $monthCountModel->formatQuery($this->map)->pluck('month')->unique()->toArray(); |
| 39 | + $month = sort($month); | ||
| 39 | $this->response('success',Code::SUCCESS,$month); | 40 | $this->response('success',Code::SUCCESS,$month); |
| 40 | } | 41 | } |
| 41 | 42 |
| @@ -23,4 +23,26 @@ class LinkDataController extends BaseController | @@ -23,4 +23,26 @@ class LinkDataController extends BaseController | ||
| 23 | public function lists(){ | 23 | public function lists(){ |
| 24 | 24 | ||
| 25 | } | 25 | } |
| 26 | + | ||
| 27 | + /** | ||
| 28 | + * @remark :批量添加 | ||
| 29 | + * @name :batchSave | ||
| 30 | + * @author :lyh | ||
| 31 | + * @method :post | ||
| 32 | + * @time :2025/3/14 16:45 | ||
| 33 | + */ | ||
| 34 | + public function batchSave(){ | ||
| 35 | + | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + /** | ||
| 39 | + * @remark :删除 | ||
| 40 | + * @name :del | ||
| 41 | + * @author :lyh | ||
| 42 | + * @method :post | ||
| 43 | + * @time :2025/3/14 16:45 | ||
| 44 | + */ | ||
| 45 | + public function del(){ | ||
| 46 | + | ||
| 47 | + } | ||
| 26 | } | 48 | } |
-
请 注册 或 登录 后发表评论