Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

chen.lin

1 天以前 c426aa30a98ce85b494de121c92e2a7d01673930

 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java

@@ -26,4 +26,9 @@

    private String locNo;

    // 任务来源：mes erp
    private String taskOrigin;
    // 任务号
    private String taskNo;

}