Merge remote-tracking branch 'origin/master'

jiangping

2024-02-04 6e41324f84f0cf70871ca05292c5420bdcaaa98c

 server/service/src/main/java/com/doumee/service/business/impl/SolutionsServiceImpl.java

@@ -190,6 +190,7 @@
                .eq(Solutions::getBaseId,solutions.getId())
                .eq(Solutions::getDataType,Constants.TWO)
                .set(Solutions::getDataType,Constants.ONE)
                .set(StringUtils.isNotBlank(solutions.getSignKeyword()),Solutions::getSignKeyword,solutions.getSignKeyword())
        );
        //处理工作信息，新增最新的，同时产生历史版本
        dealWorkType(solutions,newModel,solutions.getWorktypeIdList(),false);