Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-09-05 86996f38d6dc5bb6a049f3ab6aa492bd22f7dde0

 jrj/project/business/GDN3.list.cpp

@@ -420,7 +420,7 @@
            KXMLDOMDocument supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
            if (supplier_x)
            {
               if (supplier_x.text() != L"跟单")
               if ((xstring)supplier_x.text() != L"跟单")
               {
                  alert(L"当前角色不是跟单员不能新增单子，请重新选择角色");
                  return 0;