Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop

src/main/java/au/com/royalpay/payment/manage/activities/app_index/beans/AppActBean.java

@@ -27,6 +27,7 @@ public class AppActBean {
     private String window_img;
     private String active_date;
     private String expire_date;
+    private String banner_img;
 
 
     public JSONObject toJsonParam(){
@@ -55,6 +56,9 @@ public class AppActBean {
         if(StringUtils.isNotEmpty(window_img)){
             params.put("window_img",window_img);
         }
+        if(StringUtils.isNotEmpty(banner_img)){
+            params.put("banner_img",banner_img);
+        }
         if (active_date != null) {
             try {
                 Date fromDate = DateUtils.parseDate(active_date, DATE_PATTERNS);
@@ -171,4 +175,12 @@ public class AppActBean {
     public void setExpire_date(String expire_date) {
         this.expire_date = expire_date;
     }
+
+    public String getBanner_img() {
+        return banner_img;
+    }
+
+    public void setBanner_img(String banner_img) {
+        this.banner_img = banner_img;
+    }
 }

src/main/ui/static/actapp/templates/act_app_detail.html

@@ -100,6 +100,15 @@
                                         </div>
                                     </div>
 
+                                    <div class="form-group">
+                                        <label class="control-label col-xs-4 col-sm-2" for="actDetail.act_img">Banner
+                                            Img</label>
+                                        <div class="col-xs-8 col-sm-4">
+                                            <input type="text" class="form-control" id="actDetail.banner_img"
+                                                   ng-model="actDetail.banner_img">
+                                        </div>
+                                    </div>
+
                                     <div class="form-group">
                                         <label class="control-label col-xs-4 col-sm-2">Show
                                             Type</label>