修改冲突

master
chenxiaojun 5 years ago
commit 232a6f7918

@ -19,7 +19,7 @@ class SsgController extends BaseController {
const CODE_ERROR = -97; //验证码错误 const CODE_ERROR = -97; //验证码错误
const RETURN_SUCCESS = 1; const RETURN_SUCCESS = 1;
const RETURN_FALSE = 2; const RETURN_FALSE = 2;
const signprice = 10; //充值金额 const signprice = 0.1; //充值金额
public function login() public function login()

Loading…
Cancel
Save