# Conflicts: # .gitignore # pom.xml # src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT520X.java
Conflicts: .gitignore src/main/java/com/sunyo/wlpt/base/model/NMMS_CUSTOM_MT520X.java
包含了舱单与运单实体