Merge branch 'master' of ssh://gitea.ttstd.com:2222/tongtong/youlai-boot
# Conflicts: # sql/app_icon.sql # src/main/java/com/youlai/boot/common/config/WebMvcConfig.java # src/main/java/com/youlai/boot/common/enums/ActionTypeEnum.java # src/main/java/com/youlai/boot/device/controller/AppIconController.java # src/main/java/com/youlai/boot/device/controller/DeviceOpsController.java # src/main/java/com/youlai/boot/device/controller/MobileController.java # src/main/java/com/youlai/boot/device/model/entity/AppIcon.java # src/main/java/com/youlai/boot/device/model/vo/AppIconVO.java # src/main/java/com/youlai/boot/device/service/AppIconService.java # src/main/java/com/youlai/boot/device/service/DeviceService.java # src/main/java/com/youlai/boot/device/service/impl/AppIconServiceImpl.java # src/main/java/com/youlai/boot/device/service/impl/DeviceServiceImpl.java
This commit is contained in:
@@ -51,7 +51,6 @@ public enum ActionTypeEnum implements IBaseEnum<Integer> {
|
|||||||
LAUNCH_APP(33, "打开应用"),
|
LAUNCH_APP(33, "打开应用"),
|
||||||
CLEAR_APP_DATA(34, "清除应用数据"),
|
CLEAR_APP_DATA(34, "清除应用数据"),
|
||||||
UNINSTALL_APP(35, "卸载应用"),
|
UNINSTALL_APP(35, "卸载应用"),
|
||||||
STOP_APP(39, "停止应用"),
|
|
||||||
UPLOAD_APP_ICON(36, "上传应用图标"),
|
UPLOAD_APP_ICON(36, "上传应用图标"),
|
||||||
LOCK_APP_ICON(37, "锁定应用图标"),
|
LOCK_APP_ICON(37, "锁定应用图标"),
|
||||||
UNLOCK_APP_ICON(38, "解锁应用图标"),
|
UNLOCK_APP_ICON(38, "解锁应用图标"),
|
||||||
|
|||||||
Reference in New Issue
Block a user