Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-11-15 1b53eda9589c43fa1e4e8e2d01f29fa79e62aa51

 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);