Merge remote-tracking branch 'origin/release' into release

# Conflicts:
#	server/src/main/java/com/pica/cloud/account/account/server/controller/TestMobileController.java

server/src/main/java/com/pica/cloud/account/account/server/controller/TestMobileController.java

@@ -3,7 +3,7 @@ package com.pica.cloud.account.account.server.controller;
 import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.foundation.entity.PicaResponse;
 import io.swagger.annotations.Api;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;