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

admin

2019-08-27 6b12faed50dda2d32c4dc2e60db59aaa721d7813

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

@@ -131,6 +131,12 @@
         state = null; // 清空

      }



      // 转换状态

      if (state != null && state == 5) {

         orderState = 2; // 已维权

         state = null; // 清空

      }

				
      if (type != null && type == 0) {

         type = null; // 所有类型订单

      }