Merge remote-tracking branch 'origin/master'

吴羡

2026-10-28 4efd37516a0723c67a2644ab0ddcf86013af6a4b

 basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java

@@ -63,9 +63,6 @@

    @Override
    public int upStandardTemplate(StandardTemplate standardTemplate) {
        if (standardTemplate.getPrice() == null) {
            standardTemplate.setPrice(java.math.BigDecimal.ZERO);
        }
        if (StringUtils.isNotBlank(standardTemplate.getThing())) {
            standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
        } else {
@@ -134,6 +131,9 @@
        // 查询旧模板
        StandardTemplate standardTemplate = baseMapper.selectById(newTemplate.getId());
        newTemplate.setThing(standardTemplate.getThing());
        if (newTemplate.getStandardRequirement() == null) {
            newTemplate.setStandardRequirement(standardTemplate.getStandardRequirement());
        }
        if (newTemplate.getPrice() == null) {
            newTemplate.setPrice(java.math.BigDecimal.ZERO);
        }