Merge remote-tracking branch 'origin/master'

cgf

2025-09-10 76088a1a46cbbc05fc92ad8d982b0dcb0da87cb2

 service-store/src/main/java/com/java110/store/cmd/contract/QueryContractCmd.java

@@ -6,7 +6,7 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.contract.ContractDto;
import com.java110.dto.contractAttr.ContractAttrDto;
import com.java110.dto.contract.ContractAttrDto;
import com.java110.intf.common.IContractApplyUserInnerServiceSMO;
import com.java110.intf.common.IContractChangeUserInnerServiceSMO;
import com.java110.intf.store.IContractAttrInnerServiceSMO;
@@ -48,6 +48,7 @@

        ContractDto contractDto = BeanConvertUtil.covertBean(reqJson, ContractDto.class);
        contractDto.setStoreId(storeId);
        contractDto.setCommunityId(reqJson.getString("communityId"));
        //如果是到期合同
        if ("1".equals(reqJson.getString("expiration"))) {
            contractDto.setNoStates(new String[]{ContractDto.STATE_COMPLAINT, ContractDto.STATE_FAIL});