1、新增會員優惠券頁面 2、處理報表圖表控件滑動衝突問題

component-main/src/main/java/com/gingersoft/gsa/cloud/main/ComponentMain.java

@@ -132,7 +132,7 @@ public class ComponentMain implements IComponent {
     }
     }
 
 
     private void openActivity(CC cc) {
     private void openActivity(CC cc) {
-        Intent intent = new Intent(cc.getContext(), NewMainActivity.class);
+        Intent intent = new Intent(cc.getContext(), MainActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         cc.getContext().startActivity(intent);
         cc.getContext().startActivity(intent);
     }
     }