Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

2 天以前 c8712bbf027d7c3db9c33f8b015abed1473d06a7

 src/main/java/com/zy/api/entity/OrderParams.java

@@ -1,7 +1,6 @@
package com.zy.api.entity;

import java.io.Serializable;
import java.util.List;

import org.springframework.format.annotation.DateTimeFormat;

@@ -57,8 +56,8 @@
    private String cus_address;




    @ApiModelProperty("WMS ID")
    private String wms_id;


    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")