Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml
This commit is contained in:
王奎兴
2026-02-09 14:29:47 +08:00
228 changed files with 17780 additions and 684 deletions
@@ -381,4 +381,4 @@
and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus}
</select>
</mapper>
</mapper>