Merge remote-tracking branch 'origin/1.0.0_online' into 1.0.0_online

modules/glj/facade/glj_facade.js

@@ -41,6 +41,7 @@ async function changeUnitFile(projectData,unitFile,type,userID) {
             insertData.user_id = userID;
             delete insertData._id;
             delete insertData.ID;
+            currentUnitPriceId = changeUnitPriceId;//从其它建设项目复制时，这个ID要变成被选中的来源的单价文件ID
         }
         // 获取即将更改的单价文件信息
         let targetUnitPriceFile = type === 0 ? await unitPriceFileModel.findDataByCondition({id: changeUnitPriceId}) :