修改

zhanghua

2023-10-02 26d24ccf61613446c7740d8c0ef3e201cf5f5274

修改

 ycl-platform/src/main/java/com/ycl/controller/smoke/InTimeController.java

File was renamed from ycl-platform/src/main/java/com/ycl/controller/smoke/SmokeController.java
@@ -10,16 +10,15 @@
import com.ycl.entity.smoke.OdsInTime;
import com.ycl.service.smoke.IOdsCustomerService;
import com.ycl.service.smoke.IOdsInTimeService;
import com.ycl.vo.store.StoreInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("/smoker")
@RequestMapping("/smoke")
@Api(tags = "油烟管理管理")
public class SmokeController extends BaseController {
public class InTimeController extends BaseController {

    IOdsInTimeService inTimeService;
    IOdsCustomerService customerService;

 ycl-platform/src/main/java/com/ycl/entity/smoke/OdsCustomer.java

@@ -182,9 +182,9 @@
    /**
     * 介绍
     */
    @TableField("desc1")
    @TableField("description")
    @JsonProperty("Desc")
    private String desc;
    private String description;


}

 ycl-platform/src/main/java/com/ycl/service/smoke/impl/OdsCustomerServiceImpl.java

@@ -30,7 +30,7 @@
        if (StrUtil.isNotEmpty(keyword)) {
            lambda.like(OdsCustomer::getName, keyword);
        }

        lambda.orderByAsc(OdsCustomer::getId);
        return this.page(page, wrapper);
    }
}

 ycl-platform/src/main/resources/mapper/smoke/OdsCustomerMapper.xml

@@ -24,7 +24,7 @@
        <result column="area_ids" property="areaIdsString" />
        <result column="area_id_cascads" property="areaIdCascadsString" />
        <result column="areas" property="areasString" />
        <result column="desc1" property="desc" />
        <result column="desc1" property="description" />
    </resultMap>

    <!-- 通用查询结果列 -->

 ycl-smoke/src/main/java/com/ycl/smoke/entity/OdsCustomer.java

@@ -183,7 +183,7 @@
    /**
     * 介绍
     */
    @TableField("desc1")
    @TableField("description")
    @JsonProperty("Desc")
    private String desc;


 ycl-smoke/src/main/resources/mapper/smoke/OdsCustomerMapper.xml

@@ -24,7 +24,7 @@
        <result column="area_ids" property="areaIdsString" />
        <result column="area_id_cascads" property="areaIdCascadsString" />
        <result column="areas" property="areasString" />
        <result column="desc1" property="desc" />
        <result column="description" property="desc" />
    </resultMap>

    <!-- 通用查询结果列 -->