Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

# Conflicts:
#	dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

dsk-operate-ui/package.json

 {
-  "name": "ruoyi",
+  "name": "dsk-operate-sys",
   "version": "3.8.5",
   "description": "数字化经营履约全生命链路管理系统",
-  "author": "若依",
+  "author": "大司空",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",

dsk-system/src/main/java/com/dsk/system/service/impl/EconomicServiceImpl.java

@@ -54,7 +54,11 @@ public class EconomicServiceImpl implements EconomicService {
         if (ObjectUtil.isEmpty(dto.getYear())) {
             dto.setYear(DateUtils.getYear() - 1);
         }
+<<<<<<< HEAD
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+=======
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/economic/national/nationalPage",  BeanUtil.beanToMap(dto, false, false));
+>>>>>>> 3f24b7925dd3f017f7b9cd923f3cdacd7c25cad0
         Integer code = MapUtils.getInteger(map, "code", 300);
         if (!code.equals(HttpStatus.OK.value())) {
             throw new RuntimeException();