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

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

@@ -348,11 +348,11 @@ public class WareService {
	 */
	@Post
	@Path("/publish/update")
	public String updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
	public boolean updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		 "shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
		return update(con, ware, null, resource);
	}
	/**
@@ -368,11 +368,11 @@ public class WareService {
	 */
	@Post
	@Path("/publish/org/update")
	public String updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
	public boolean updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
		return update(con, ware, professor, resource);
	}
	/**