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

admin

2019-11-24 0e62463b823613faee3004eeee5c6f95ba15ef3c

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

@@ -85,7 +85,7 @@
                  && order.getResultCode() == LostOrder.RESULT_CODE_SUCCESS) {

               // 申诉成功

               json.put("state", 1);

               json.put("stateDesc", "订单找回成功，请我的-订单中查看");

               json.put("stateDesc", "订单找回成功，请到我的-订单中查看");

            } else if (order.getState() == 2 || (order.getState() == 1 && order.getResultCode() != null

                  && order.getResultCode() == LostOrder.RESULT_CODE_FAIL)) {

               // 申诉失败