Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java

@@ -166,6 +166,7 @@
                i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
            }
            if (i) {
                serviceDonorchargeorgan.setId(null);
                QueryWrapper<ServiceDonorchargeorgan> queryWrapper = new QueryWrapper();
                queryWrapper.eq("InfoID", serviceDonorchargeorgan.getInfoid())
                        .eq("OrganNo", serviceDonorchargeorgan.getOrganno());
@@ -178,6 +179,7 @@
                }
            }
        }
        return toAjax(i);
        // 回传带主键的列表，便于前端回填 id
        return AjaxResult.success(serviceDonatecomporganList);
    }
}