Merge remote-tracking branch 'origin/div' into div

admin

2019-09-10 6671279208f1dc96df8bb437f9009bdabe0df497

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

@@ -196,6 +196,8 @@
            stateInfo = "该订单申诉已失败，请在订单列表中查看";

         } else if (state == -7) {

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

         }else if (state == -1001) {

            stateInfo = "订单违规";

         }

      }

      JSONObject data = new JSONObject();