Merge pull request #337 from support-project/develop

Develop -> Master
support-project · Apr 5, 2016 · ebb316d · ebb316d
2 parents 49e7191 + d261948
commit ebb316d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>org.support-project</groupId>
     <artifactId>knowledge</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
     <packaging>war</packaging>
 
     <name>knowledge</name>

diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -55,7 +55,7 @@ message.allready.started=Allready started.
 message.confirm.delete=Are you sure you want to delete?
 
 # Common Label
-label.version=v1.3.0
+label.version=v1.3.1
 label.login=Sign in
 label.previous = Previous
 label.next=Next

diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -55,7 +55,7 @@ message.allready.started=すでに開始済です
 message.confirm.delete=本当に削除しますか?
 
 # Common Label
-label.version=v1.3.0
+label.version=v1.3.1
 label.login=サインイン
 label.previous = 前へ
 label.next = 次へ

diff --git a/...pport/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyDesktopUsersOnPublicComment.sql b/...pport/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyDesktopUsersOnPublicComment.sql
@@ -10,5 +10,5 @@ WHERE
     AND NOTIFY_CONFIGS.NOTIFY_DESKTOP = 1
     AND USERS.DELETE_FLAG = 0
 ORDER BY USERS.INSERT_USER
-)
+) AS RESULT
 LIMIT ? OFFSET ?
diff --git a/.../support/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyMailUsersOnPublicComment.sql b/.../support/project/knowledge/dao/sql/NotifyConfigsDao/GetNotifyMailUsersOnPublicComment.sql
@@ -10,5 +10,5 @@ WHERE
     AND NOTIFY_CONFIGS.NOTIFY_MAIL = 1
     AND USERS.DELETE_FLAG = 0
 ORDER BY USERS.INSERT_USER
-)
+) AS RESULT
 LIMIT ? OFFSET ?