Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

 src/main/java/com/moral/common/bean/AppData.java

@@ -12,7 +12,7 @@
   public static final int SUCCESS = 0;

   public static final int FAIL = 1;

   public static final int NO_PERMISSION = 2;

   private String message = "success";

   private String message = "成功";

   private int errno = SUCCESS;

   private T data;