Merge remote-tracking branch 'origin/master'

wangting

2023-07-06 b379f48fc13255c4a8d946f1c87678512a133107

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java

@@ -456,7 +456,7 @@
   public R deleteCodeBasicSecByPrimaryKey(String oid) throws VciBaseException {
      CodeBasicSec codeBasicSecDO = selectByOid(oid);
      boolean isLinked = checkIsLinked(codeBasicSecDO.getPkCodeRule(), oid);
      if (!isLinked) {
      if (isLinked) {
         return R.fail("编码规则已被引用，不允许编辑或删除");
      }
      //执行删除操作