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

src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java

@@ -227,6 +227,7 @@ public class BasicProductCategoryController {
             list.add(udiRelevanceResponse.getId());
         }
         filterUdiRelRequest.setExistid(list);
+        filterUdiRelRequest.setIsDisable(false);
         List<UdiRelevanceResponse> udiRelevanceResponses = null;