Merge remote-tracking branch 'remotes/origin/yufei' into master

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

 src/main/java/com/nanometer/smartlab/util/Constants.java

@@ -50,6 +50,7 @@
    public static final String PAGE_VIEW_ORDER_MNG = "view_order_mng";
    public static final String PAGE_CANCEL_ORDER_MNG = "cancel_order_mng";
    public static final String PAGE_WAREHOUSE_REAGENT_DIRECT_STORE = "warehouse_reagent_direct_store";
    public static final String PAGE_ORDER_INPUT_WAREHOUSE = "order_input_warehouse";

    // -----页面名称（以xhtml文件名为准）end-----