Merge remote-tracking branch 'origin/master' into dev

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -1793,7 +1793,7 @@ public class SysService {
	@Path("/regmobilephone")
	public String regMobilePhone(@JdbcConn(false) Connection con, String mobilePhone, @DefaultValue("true") boolean checkExists,String vcode,@SessionVal(value="verification",remove=true) String scode)
			throws JfwBaseException, SQLException {
		if(!vcode.equals(scode)){
		if(!vcode.toUpperCase().equals(scode)){
			throw new JfwBaseException(20001, "valid code error");
		}
		if (checkExists) {