Merge remote-tracking branch 'origin/master'

linwe

2023-11-28 1bdcee0880108bb3aeb6e3cdffe2a292c37b56bc

 src/views/tool/code.vue

@@ -417,7 +417,7 @@
                this.form.pkName = "id";
              }
              if (validatenull(this.form.packageName)) {
                this.form.packageName = `org.springblade.${modelCode}`;
                this.form.packageName = `org.springblade.modules.${modelCode}`;
              }
              if (validatenull(this.form.subFkId) && !validatenull(this.form.tablePrefix)) {
                this.form.subFkId = modelTable.replace(this.form.tablePrefix, "") + "_id";