Merge branch 'feature/1.0.0' of github.com:ab-inbev-apac/abi-cloud-qr-platform into feature/1.0.0

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ActivateNowReq.java

@@ -1,10 +1,12 @@
 package com.abi.qms.platform.dto.req;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -23,5 +25,6 @@ public class ActivateNowReq implements Serializable {
     private String productionLineName;
 
     @ApiModelProperty(value = "生产日期")
-    private String productionTime;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime productionTime;
 }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/QrBoxMappingServiceImpl.java

@@ -259,7 +259,7 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
         for (String boxCode : boxCodeList) {
             QrBoxMapping qrBoxMapping = getActiveQrBoxMapping(boxCode);
             qrBoxMapping.setProductionLineName(req.getProductionLineName());
-            qrBoxMapping.setProductionTime(LocalDateTime.parse(req.getProductionTime()));
+            qrBoxMapping.setProductionTime(req.getProductionTime());
             qrBoxMappingMapper.updateById(qrBoxMapping);
         }
     }