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

疯狂的狮子Li

2022-04-11 d637f03067bfb71c38a52b3fc243a41f279e6e82

 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;
}