Merge remote-tracking branch 'origin/master'

wang1

2023-06-26 45d6fb0c9846c1a8f55958ed8fc00ed909470610

 Source/UBCS-WEB/src/views/tool/code.vue

@@ -411,7 +411,7 @@
                this.form.codeName = modelName;
              }
              if (validatenull(this.form.serviceName)) {
                this.form.serviceName = `blade-${modelCode}`;
                this.form.serviceName = `ubcs-${modelCode}`;
              }
              if (validatenull(this.form.pkName)) {
                this.form.pkName = "id";