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

ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspection.html

@@ -64,7 +64,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var processingFlag = [[${@permission.hasPermi('erp:materialReturnInspection:edit')}]];
+        var processingFlag = [[${@permission.hasPermi('quality:returnInspection:processing')}]];
         var detailFlag = [[${@permission.hasPermi('quality:returnInspection:detail')}]];
         // 字典
         var urgencyLevelDatas = [[${@dict.getType('urgency_level')}]];