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

1

12 小时以前 5e567919108b4e1c914cdb1aae5d91ff2eb337d7

 src/main/java/com/zy/asrs/entity/Order.java

@@ -315,6 +315,7 @@
        this.memo = memo;
    }


    public Order(String uuid,String orderNo,String orderTime,Long docType,Long itemId,String itemName,Long allotItemId,String defNumber,String number,Long cstmr,String cstmrName,String tel,String operMemb,Double totalFee,Double discount,Double discountFee,Double otherFee,Double actFee,Integer payType,String salesman,Integer accountDay,Integer postFeeType,Double postFee,Date payTime,Date sendTime,String shipName,String shipCode,Long settle,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Integer pakinPakoutStatus) {
        this.uuid = uuid;
        this.orderNo = orderNo;