Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-10-17 be3c5ac348599e722864bb16670ccef5e134e8ba

 server/services/src/main/java/com/doumee/service/business/impl/BaseParamServiceImpl.java

@@ -97,7 +97,7 @@
        wrapper.lambda()
                .eq(BaseParam::getType,baseParam.getType())
                .eq(BaseParam::getIsdeleted,Constants.ZERO)
                .eq(BaseParam::getType,baseParam.getName());
                .eq(BaseParam::getName,baseParam.getName());

        BaseParam baseParam1 = baseParamMapper.selectOne(wrapper.last(" limit 1"));
        if (Objects.nonNull(baseParam1) && !baseParam1.getId().equals(baseParam.getId())){