Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2022-05-16 970561b956d0c3b9d81a2ede3f2611f0403d60d3

 ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java

@@ -21,7 +21,12 @@
    /**
     * app端
     */
    APP("app");
    APP("app"),

    /**
     * 小程序端
     */
    XCX("xcx");

    private final String device;
}