Merge branch 'dev/dev' into dev/dev_shb

# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java
#	src/main/java/com/ai/da/controller/SavedCollectionController.java
#	src/main/java/com/ai/da/service/AccountService.java
#	src/main/java/com/ai/da/service/UserLikeGroupService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java

src/main/java/com/ai/da/controller/AccountController.java

@@ -262,6 +262,13 @@ public class AccountController {
         return Response.success(true);
     }
 
+    @PostMapping("temporaryUpgrade")
+    @ApiOperation(value = "临时升级")
+    public Response<Boolean> temporaryUpgrade() {
+        accountService.temporaryUpgrade();
+        return Response.success(true);
+    }
+
     @PostMapping("enterpriseLogin")
     @ApiOperation(value = "企业登录")
     public Response<AccountLoginVO> enterpriseLogin(@Valid @RequestBody AccountLoginDTO accountDTO) {