Merge remote-tracking branch 'origin/master'

tenant/organization/src/main/java/com/jzg/organization/controller/PtlAgreementCostController.java

@@ -10,7 +10,6 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
-import org.ehcache.shadow.org.terracotta.offheapstore.paging.Page;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlAgreementServiceImpl.java

@@ -338,7 +338,7 @@ public class PtlAgreementServiceImpl extends ServiceImpl<PtlAgreementMapper, Ptl
                 BeanUtils.copyProperties(agreementCost,newAgreementCost);
                 newAgreementCost.setId(null);
                 newAgreementCost.setApproved(0);
-                newAgreementCost.setIsEnabled(Boolean.TRUE);
+                newAgreementCost.setIsEnabled(0);
                 agreementCostService.save(newAgreementCost);
                 List<PtlAgreementCostRule> costRules = costRulesMap.get(agreementCost.getId());
                 costRules.forEach(costRule -> {