Merge branch 'master' into csc

chengsc

2024-10-18 1e26a7575d9969e728b0aa01466f490409cb173c

 Pda/js/public.js

@@ -5,6 +5,7 @@
 //var IP = "http://192.168.1.2:8017/";
// var IP = "http://192.168.10.112/WmsService/";
// var IP = "http://192.168.1.226:8086";
// var IP = "http://192.168.62.200:8888/api";  
jQuery.support.cors = true;
function sendData(url, data, type, callbackFun) {
   // callbackFun("{}");