Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-15 c41016b0aba1a3ebbf494669570c3a9c2c74d759

 flower_city/src/main/java/com/dg/core/service/impl/GuideEvolveImpl.java

@@ -26,7 +26,7 @@
    @Override
    public List<GuideEvolveEntity> selectConfigList(String guideId,SysUser sysUser) {
        List<GuideEvolveEntity> guideEvolveEntities;
        if (sysUser.getUserType().equals("3")){
        if (sysUser.getUserType().equals("4")){
            guideEvolveEntities=baseMapper.selectHideList(guideId);
        }else {
            guideEvolveEntities = baseMapper.selectConfigList(guideId);