Merge branch 'master' of codeup.aliyun.com:6618f834290482f52b27ebad/hucs-enterprise/peipei-backend

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserInfoEntity.java

@@ -157,6 +157,27 @@ public class PlayClerkUserInfoEntity extends BaseEntity<PlayClerkUserInfoEntity>
      */
     private String onboardingState;
 
+
+    /**
+     * 入职时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime entryTime;
+
+    /**
+     * 离职时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime resignationTime;
+
+    /**
+     * 在职天数
+     */
+    private Integer workingHours = 0;
+
+
     /**
      * 是否推荐状态（1：已推荐，0：未推荐）
      */

play-admin/src/main/java/com/starry/admin/modules/clerk/module/entity/PlayClerkUserReturnVo.java

@@ -165,4 +165,24 @@ public class PlayClerkUserReturnVo {
     private LocalDateTime addTime;
 
 
+    /**
+     * 入职时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime entryTime;
+
+    /**
+     * 离职时间
+     */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private LocalDateTime resignationTime;
+
+    /**
+     * 在职天数
+     */
+    private Integer workingHours = 0;
+
+
 }

play-admin/src/main/java/com/starry/admin/modules/shop/controller/PlayShopCarouselInfoController.java

@@ -7,6 +7,7 @@ import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoAddVo;
 import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoQueryVo;
 import com.starry.admin.modules.shop.module.vo.PlayShopCarouselInfoUpdateStateVo;
 import com.starry.admin.modules.shop.service.IPlayShopCarouselInfoService;
+import com.starry.admin.utils.SecurityUtils;
 import com.starry.common.annotation.Log;
 import com.starry.common.enums.BusinessType;
 import com.starry.common.result.R;
@@ -44,8 +45,8 @@ public class PlayShopCarouselInfoController {
 
     @PostMapping("/uploadFile")
     public R uploadFile(@RequestParam("file") MultipartFile file) throws IOException {
-//        String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename());
+        String fileAddress = ossFileService.upload(file.getInputStream(), SecurityUtils.getTenantId(), file.getOriginalFilename());
-        return R.ok("https://live-cloud-cvoon.oss-cn-hangzhou.aliyuncs.com/7f7ecd75fd29464db2867982f88e8ef0/2024/06/05/f8a42353c957.jpg");
+        return R.ok(fileAddress);
     }