Commit Graph

3 Commits

Author SHA1 Message Date
zhang
ea706b2a62 Merge branch '1220' into bf_master
# Conflicts:
#	wms_pro/hd/nladmin-system/.idea/.gitignore
#	wms_pro/hd/nladmin-system/.idea/compiler.xml
#	wms_pro/hd/nladmin-system/.idea/encodings.xml
#	wms_pro/hd/nladmin-system/.idea/jarRepositories.xml
#	wms_pro/hd/nladmin-system/.idea/misc.xml
#	wms_pro/hd/nladmin-system/.idea/vcs.xml
2024-12-21 13:59:52 +08:00
zhang
111f6fda15 国际化改造 2024-12-21 13:58:29 +08:00
9a281ffbd7 rev:仓位、库区、组盘国际化 2024-12-21 13:33:24 +08:00