Merge remote-tracking branch 'origin/master'

wangting

2023-08-03 0525d2e57e97b7466a1b4227fd3d06d4685263d4

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeClassifyTemplateAttrController.java

@@ -145,9 +145,9 @@
      }
      String tenantId = AuthUtil.getTenantId().toString();
      Map<String, String> conditionMap = baseQueryObject.getConditionMap();
      if(Func.isNotEmpty(tenantId)){
      /*if(Func.isNotEmpty(tenantId)){
         conditionMap.put("TENANT_ID",tenantId);
      }
      }*/
      return CodeClstempattrService.gridCodeClassifyTemplateAttr(conditionMap,baseQueryObject.getPageHelper());
   }