Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/OrderController.java

@@ -11,6 +11,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.info.order.domain.bo.OrderBo;
 import com.ruoyi.info.order.domain.vo.OrderVo;
+import com.ruoyi.info.order.enums.OrderStatus;
 import com.ruoyi.info.order.service.IOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,7 +22,9 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单Controller
@@ -48,6 +51,14 @@ public class OrderController extends BaseController {
         return iOrderService.queryAllPageList(bo, pageQuery);
     }
 
+    @ApiOperation("枚举")
+    @GetMapping("/enum")
+    public R<Map<String,  Object>> getEnum() {
+        Map<String, Object> map = new HashMap<>();
+        map.put("orderStatus", OrderStatus.toJsonArray());
+        return R.ok(map);
+    }
+
     /**
      * 获取订单详细信息
      */