合并代码

无关风月

2025-01-21 8f2abbbda6c87c59d0c2c5da9979e78ea38e74db

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java

@@ -145,10 +145,16 @@
            model.addAttribute("shopName",byId.getName());
            Integer coursePackageId = pointMercharsVo.getCoursePackageId();
            List<String> name = courseClient.queryPackageById(coursePackageId);
            if(null != name){
                model.addAttribute("typeName",name.get(0));
                model.addAttribute("pageName",name.get(1));
            }else{
                model.addAttribute("typeName", "");
                model.addAttribute("pageName", "");
            }
            Integer coursePackageId1 = pointMercharsVo.getCoursePackageId();
            List<CoursePackagePaymentConfig> hoursByPackageId = courseClient.getHoursByPackageId(coursePackageId1);
            model.addAttribute("typeName",name.get(0));
            model.addAttribute("pageName",name.get(1));

            model.addAttribute("classHours",hoursByPackageId);
            String productImages = pointMercharsVo.getProductImages();
            ArrayList<String> strings = new ArrayList<>();