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

xj qian

2024-07-02 c93629be9b5bef0ebeadf26bff2c3730467a68d5

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

 jrj/project/business/GDN/GDNSourcePaperCard.cpp

Binary files differ

 jrj/project/business/HR/ManpowerFile.cpp

@@ -180,8 +180,8 @@
            
            arg.AddArg(L"html", str);
            int obj = cast(dw_list as int);
            arg.AddArg(L"obj", obj.toString());
            OpenWindow(L"dev:xpage[data.vanalysis.vx]", cast(arg as int));
            arg.AddArg(L"obj", xstring(obj));
            OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
            xutil::RestoreCursor(hCursor);
            return 1;
        }