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

Junjie

7 天以前 637e8436a33cbc4ea04d4fc68763debaba8412c4

 src/main/java/com/zy/nc/entity/NccScZkmxbWms.java

@@ -314,6 +314,8 @@
     */
    private String wmsMemo;



    @Override
    public boolean equals(Object that) {
        if (this == that) {