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

# Conflicts: # api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java
3 years ago · b8e92dd1b7
parent c946ef8422 38416a4755
commit b8e92dd1b7
1 changed files with 5 additions and 0 deletions
--- a/api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/constant/BasicExportTypeEnum.java
@ -47,6 +47,11 @@ public enum BasicExportTypeEnum {
     */
    ORDER_INVOICE("io_order_invoice", "扫码单据发票信息"),

+    /**
+     * 单据信息
+     */
+    IO_ORDER("io_order", "单据信息"),
+
    ;
    private String key;