Merge branch 'dev' of wugg/cxinv into master

app/admin/controller/Stat.php

@@ -4,13 +4,14 @@
 namespace app\admin\controller;
 use app\BaseController;
 use think\App;
-use think\facade\Db;
+use think\facade\Cache;use think\facade\Db;
 
 class Stat extends BaseController{
 	public function __construct(App $app) {parent::__construct($app);}
 
 	public function stats(){
-		  $tips = Db::name("depart_tips")->field("department,total_tips")->where('year=YEAR(NOW()) and month=month(NOW())')->select();
+		 $data=Cache::get("statContent");
 
+		 return app_show(0,"获取成功",$data);
 	}
 }

app/admin/route/app.php

@@ -222,8 +222,11 @@ Route::rule('pie','admin/Export/payInvoiceExport');//用友销票表
 Route::rule('pe','admin/Export/payExport');//对账单汇总
 Route::rule('cm','admin/Export/cgdManage');//采购单明细表
 
-route::rule("interadd","admin/InterOrder/create");
-route::rule("interedit","admin/InterOrder/save");
-route::rule("interlist","admin/InterOrder/list");
-route::rule("interinfo","admin/InterOrder/info");
-route::rule("intercat","admin/InterOrder/getCat");
+route::rule("interadd","admin/InterOrder/create");//网络部录单
+route::rule("interedit","admin/InterOrder/save");//网络部录单
+route::rule("interlist","admin/InterOrder/list");//网络部录单列表
+route::rule("interinfo","admin/InterOrder/info");//网络部录单详情
+route::rule("intercat","admin/InterOrder/getCat");//网络部录单分类
+
+route::rule("stats","admin/Stat/stats");//网络部录单分类
+