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

lsh

昨天 3041eb1b0b76b75b916939e77c7ae97a80fe5af3

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

@@ -466,6 +466,18 @@
        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
    }

    public String getPakinPakoutStatus$(){
        switch (this.pakinPakoutStatus){
            case 1:
                return "Y";
            case 2:
                return "N";
            default:
                return null;
        }
    }


    public void sync(Object source) {
        Synchro.Copy(source, this);
    }