Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Data.php

@@ -270,7 +270,7 @@ class Data extends BaseController
                 ];
             }
         }
-        
+
         //部门销售指标
         $sale_indicators = Db::name('depart_tips')
             ->field('id,total_tips,depart_item department')

app/admin/controller/System.php

@@ -213,7 +213,7 @@ class System extends BaseController
         $val = Validate::rule([
             'module' => 'require|max:255',
             'system' => 'require',
-            'sys_type' => 'require|in:msg,ver',
+            'sys_type' => 'require|upper|in:MSG,VER',
             'version' => 'require|max:255',
             'addtime' => 'require|date',
         ]);