Merge remote-tracking branch 'origin/master'

YYC

2023-07-06 6105a2d7b44ad0bf0d73d19df34158e9acff75af

 igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java

@@ -8,9 +8,9 @@
import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSlogan;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.List;
import java.util.Map;

@@ -22,7 +22,7 @@
@Service(CoreDicService.BEAN_ID)
public class CoreDicDataServiceImpl implements CoreDicService {

    @Autowired
    @Resource
    private DicDataMapper dicDataMapper;

    @Override