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

src/main/java/com/szwl/controller/TAdminController.java

@@ -834,6 +834,11 @@ public class TAdminController {
         } else {
             oldAdmin.setCurrencySymbol("￥");
         }
+        if (StringUtils.isNotEmpty(admin.getTimeZone())) {
+            oldAdmin.setTimeZone(admin.getTimeZone());
+        } else {
+            oldAdmin.setTimeZone("Asia/Shanghai");
+        }
         if (admin.getApplyStartTime() != null) {
             oldAdmin.setApplyStartTime(admin.getApplyStartTime());
         }