Merge remote-tracking branch 'origin/jtwy' into jtwy

gongchunyi

昨天 da54b18e2934c39eb21e246aeda8baef9d1af933

 src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java

@@ -95,8 +95,8 @@
     * @param productId
     * @return
     */
    @GetMapping("/{productId}")
    public AjaxResult QualityInspectDetail(@PathVariable("productId") Integer productId) {
    @GetMapping("/product/{productId}")
    public AjaxResult QualityInspectDetail(@PathVariable("productId") Long productId) {
        return AjaxResult.success(qualityTestStandardService.list(Wrappers.<QualityTestStandard>lambdaQuery().eq(QualityTestStandard::getProductId,productId)));
    }