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

xj qian

2024-07-17 b1d01ea6fa62ce12c2e592b3315186f6b3c8359d

 jrj/project/business/BasicCode/CartermList.cpp

@@ -34,7 +34,7 @@


   xstring GetGuid() {
      return TApp::GetGuid();
      return publiccode::GetGuid();
   }
   int OnAddrow()
   {