Merge branch 'master' into wxw

Administrator

2024-02-04 719ef250e88b8628ba5cbaeb4973b7c693e01694

 HTML/views/WareHouseSetting/Roadway.html

@@ -115,7 +115,7 @@
               for (var i = 0; i < res.data.length; i++) {
                  if (res.data[i].WareHouseNo == 'W01')
                  {
                     $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + 
                     $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
                     res.data[i].WareHouseName + '</option>');
                  }