Merge branch 'master' into develop

kustomization/overlays/prod/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/oms
-  newTag: e636a362dcc7c1eb97135841e578b506e6ec32bb
+  newTag: 5f7d658c5be784735a6e2b3193535ce0f595c888

src/main/java/com/mmc/oms/model/vo/mall/PointsOrderVO.java

@@ -78,7 +78,7 @@ public class PointsOrderVO {
     private String goods;
 
     @ApiModelProperty(value = "订单创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createTime;
     /**
      * 商品图片