Merge branch 'dev' into test

share-front/src/main/java/share/web/controller/system/SecondaryCardConfController.java

@@ -5,6 +5,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import share.common.core.controller.BaseController;
+import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.system.domain.vo.SecondaryCardConfVo;
 import share.system.service.SecondaryCardConfService;
@@ -33,4 +34,12 @@ public class SecondaryCardConfController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询次卡配置列表
+     */
+    @GetMapping("/query")
+    public R<List<SecondaryCardConfVo>> query() {
+        return R.ok(secondaryCardConfService.selectSecondaryCardConfList(null));
+    }
+
 }