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

src/main/java/com/ekexiu/portal/msg/WebMsgDao.java

	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_ACTOR = NUM_OF_ACTOR + 1,SHOW_OF_ACTOR='1'")
	@SetSentence("NUM_OF_ACTOR = NUM_OF_ACTOR + 1,SHOW_OF_ACTOR='1',SHOW_OF_OWNER='1'")
	int incActorNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith
	@From(WebMsgIdx.class)
	@SetSentence("NUM_OF_OWNER = NUM_OF_OWNER + 1,SHOW_OF_OWNER='1'")
	@SetSentence("NUM_OF_OWNER = NUM_OF_OWNER + 1,SHOW_OF_OWNER='1',SHOW_OF_ACTOR='1'")
	int incOwnerNum(Connection con, String owner, String actor, @Set String lastCnt, @Set long lastTime) throws SQLException;
	@UpdateWith