Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-18 51e30a5f25ed53c9c65aa177f4869e4bcb8f6d55

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/BaseModel.java

@@ -1,6 +1,7 @@
package com.ruoyi.integration.drainage.model;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.other.api.domain.Operator;
import lombok.Data;
@@ -42,5 +43,6 @@
   /**
    * 运营商对象
    */
   @JsonIgnore
   private Operator operator;
}