Merge branch 'feature/crm' into 'master'

[crm]增加获取所有广告主内部接口(实现类增加mapping)

See merge request rays/pcloud-book!1351

pcloud-service-book/src/main/java/com/pcloud/book/advertising/service/impl/AdvertisingSpaceServiceImpl.java

@@ -113,6 +113,7 @@ public class AdvertisingSpaceServiceImpl implements AdvertisingSpaceService {
     }
 
     @Override
+    @GetMapping("getAllMaster")
     public ResponseEntity<ResponseDto<List<AdvertisingMasterBaseDTO>>> getAllMasterBaseInfo() throws BizException {
         List<AdvertisingMasterDTO> allMaster = advertisingSpaceBiz.getAllMaster();
         ArrayList<AdvertisingMasterBaseDTO> dtoList = new ArrayList<>();