Merge remote-tracking branch 'origin/6-29' into 6-29

peternameyakj

2024-07-14 85037c73f8b16f4258a2af354cd162247700ffde

 src/main/java/com/nq/controller/backend/AdminStockSubscribeController.java

@@ -42,8 +42,9 @@
                               @RequestParam(value = "zt", required = false) Integer zt,
                               @RequestParam(value = "isLock", required = false) Integer isLock,
                               @RequestParam(value = "type", required = false) Integer type,
                               @RequestParam(value = "stockType", required = false) Integer stockType,
                               HttpServletRequest request) {
        return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,request);
        return this.iStockSubscribeService.list(name,code,zt,0,isLock,type,stockType,1,request);
    }
    /** 
    * @Description:  新增新股