Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-web into dev

src/main/java/com/ekexiu/portal/ware/WareService.java

@@ -454,7 +454,7 @@ public class WareService {
	 * @throws SQLException
	 */
	@Get
	@Path("/pq/org/seach")
	@Path("/pq/org/search")
	public PageQueryResult<CountWare> pageQueryOrg(@JdbcConn Connection con, @Nullable String key, String oid, int pageSize, int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";
@@ -539,7 +539,7 @@ public class WareService {
	 * @throws SQLException
	 */
	@Get
	@Path("/pg/seach")
	@Path("/pg/search")
	public PageQueryResult<Ware> pageQuery(@JdbcConn Connection con, @Nullable String key, String pid, int pageSize, int pageNo) throws SQLException {
		if (key != null) {
			key = "%" + key + "%";