Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

skyouc

2025-07-18 bd1d4feea4f9522c69ef4c0fd72b1221eae5201f

 rsf-admin/src/i18n/en.js

@@ -97,6 +97,7 @@
                desc: 'Are you sure you want to proceed?',
            },
            placeholder: 'Please enter your search content',
            locEmpty: 'Check Locs can not NULL',
        },
        aside: {
            category: 'Category',
@@ -877,7 +878,7 @@
                groupQty: 'Group Qty',
                qty: "qty",
                orderNum: "orderNum",
                progress:"progress"
                progress: "progress"
            },
            waveItem: {
                waveId: "waveId",