Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-10-24 785c7495c11b76b60aa86545eecc3ec3b870d5a5

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