Browse Source

Merge pull request #833 from flipped-aurora/pgsqlDevelop

v2.4.6 beta.2
main
奇淼(piexlmax 3 years ago
committed by GitHub
parent
commit
71046a2c89
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      server/source/system/view_authority_menu_mysql.go
  2. 1
      server/source/system/view_authority_menu_postgres.go
  3. 2
      web/.gitignore
  4. 12882
      web/package-lock.json
  5. 9264
      web/yarn.lock

1
server/source/system/view_authority_menu_mysql.go

@ -37,6 +37,7 @@ func (v *viewAuthorityMenuMysql) Initialize() error {
@menus.keep_alive AS keep_alive, @menus.keep_alive AS keep_alive,
@menus.menu_level AS menu_level, @menus.menu_level AS menu_level,
@menus.default_menu AS default_menu, @menus.default_menu AS default_menu,
@menus.close_tab AS close_tab,
@authorities_menus.sys_base_menu_id AS menu_id, @authorities_menus.sys_base_menu_id AS menu_id,
@authorities_menus.sys_authority_authority_id AS authority_id @authorities_menus.sys_authority_authority_id AS authority_id
from (@authorities_menus from (@authorities_menus

1
server/source/system/view_authority_menu_postgres.go

@ -37,6 +37,7 @@ func (a *viewAuthorityMenuPostgres) Initialize() error {
@menus.deleted_at as deleted_at, @menus.deleted_at as deleted_at,
@menus.menu_level as menu_level, @menus.menu_level as menu_level,
@menus.default_menu as default_menu, @menus.default_menu as default_menu,
@menus.close_tab as close_tab,
@authorities_menus.sys_base_menu_id as menu_id, @authorities_menus.sys_base_menu_id as menu_id,
@authorities_menus.sys_authority_authority_id as authority_id @authorities_menus.sys_authority_authority_id as authority_id
from (@authorities_menus join @menus on ((@authorities_menus.sys_base_menu_id = @menus.id)));` from (@authorities_menus join @menus on ((@authorities_menus.sys_base_menu_id = @menus.id)));`

2
web/.gitignore

@ -1 +1,3 @@
node_modules/* node_modules/*
package-lock.json
yarn.lock

12882
web/package-lock.json
File diff suppressed because it is too large
View File

9264
web/yarn.lock
File diff suppressed because it is too large
View File

Loading…
Cancel
Save