解决冲突

MrShi

2026-04-02 a29e0df3c165dfe2ddd825bb340ed480a64865db

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwStocktakingRecordServiceImpl.java

@@ -195,6 +195,7 @@
                .set(YwStocktakingRecord::getActStock,ywStocktakingRecord.getActStock())
                .set(YwStocktakingRecord::getUserId,loginUserInfo.getId())
                .set(YwStocktakingRecord::getPlanDate, DateUtil.getCurrDateTime())
                .set(StringUtils.isNotBlank(ywStocktakingRecord.getRemark()),YwStocktakingRecord::getRemark, ywStocktakingRecord.getRemark())
                .eq(YwStocktakingRecord::getId,ywStocktakingRecord.getId())
        );