Merge branch 'notice' into develop

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -876,8 +876,8 @@ public class RetailAppServiceImp implements RetailAppService {
         if (latestNotice != null) {
             latestNotice.put("id", latestNotice.getString("notice_id"));
             latestNotice.remove("notice_id");
-        }
             notice.put("data", latestNotice);
+        }
         JSONObject unReadParams = new JSONObject();
         unReadParams.put("client_id", client_id);
         unReadParams.put("status", 0);