Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-21 3c70eb54adc44b1b6375e5db16d79413a0c1ed7c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOperLogDAO.java

@@ -1,9 +1,9 @@
package com.panzhihua.service_community.dao;

import org.apache.ibatis.annotations.Mapper;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.service_community.model.dos.ComShopOperLogDO;
import com.panzhihua.service_community.model.dos.ComShopOrderDO;
import org.apache.ibatis.annotations.Mapper;

/**
 * @author cedoo