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

src/main/java/com/ekexiu/portal/dao/ProfessorDao.java

@@ -482,7 +482,7 @@ public abstract class ProfessorDao {
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
		int index = 1;
		String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID,P.PHONE,P.EMAIL "
				+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID,P.PHONE,P.EMAIL,P.PROVINCE "
				+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
@@ -531,6 +531,7 @@ public abstract class ProfessorDao {
					professor.setShareId(rs.getLong(14));
					professor.setPhone(rs.getString(15));
					professor.setEmail(rs.getString(16));
					professor.setProvince(rs.getString(17));
					return professor;
				} else {
					return null;