Merge remote-tracking branch 'origin/master'

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/swc/hcdm/formplugin/web/AdjustJobBillEdit.java

@@ -525,6 +525,8 @@ public class AdjustJobBillEdit extends HRDataBaseEdit implements BeforeF7SelectL
                 model.setValue("nckd_adjfile", adjFile, rowNum);
                 model.setValue("nckd_salname", adjFile.getString("person.name"), rowNum);
                 model.setValue("nckd_salnumber", adjFile.getString("person.number"), rowNum);
+                model.setValue("nckd_saladminorg", adjFile.getDynamicObject("adminorg"), rowNum);
+                model.setValue("nckd_salposition", adjFile.getDynamicObject("position"), rowNum);
                 model.setValue("nckd_standarditem", record.getDynamicObject("standarditem"), rowNum);
                 model.setValue("nckd_oldamount", record.getBigDecimal("amount"), rowNum);
             }