Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

learn/active/src/Api.php

@@ -157,7 +157,7 @@ Class Api extends Core {
 	public function getDesc(){
 		$id = Dever::input('id');
 		if (!$id) {
-			Dever::alert('订单id不能不空');
+			Dever::alert('订单id不能为空');
 		}
 		$user = $this->user;
 		$data['user']['name'] = $user['name'];