Merge remote-tracking branch 'origin/master'

admin

2019-05-15 3be3f6e670d2e11d7ced76b8202f0ef30b56870f

 fanli/src/main/java/com/yeshi/fanli/controller/client/LostOrderController.java

@@ -171,6 +171,8 @@
            stateInfo = "分享奖金订单无需申诉";

         } else if (state == -6) {

            stateInfo = "该订单申诉已失败，请在订单列表中查看";

         } else if (state == -7) {

            stateInfo = "今日申诉次数已达上限";

         }

      }

      JSONObject data = new JSONObject();