Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-10-21 726c2e196bac6e56f588736c68b07a933dabb127

 flower_city/src/main/java/com/dg/core/db/gen/mapper/GuideEvolveMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dg.core.db.gen.entity.GuideEvolveEntity;
import org.springframework.data.repository.query.Param;

import java.util.List;

@@ -47,4 +48,7 @@
     */
    int updateGuid();




}