Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

合并main #3

Merged
merged 15 commits into from
May 26, 2024
Merged

合并main #3

merged 15 commits into from
May 26, 2024

Commits on May 9, 2024

  1. 自动化创建代码增加int64和uint(默认id类型)

    @xue-ding-e
    xue-ding-e committed May 9, 2024
    Configuration menu
    Copy the full SHA
    5b905c9 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Merge pull request #2 from flipped-aurora/main 

    合并
    @xue-ding-e
    xue-ding-e committed May 10, 2024
    Configuration menu
    Copy the full SHA
    798d8b8 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 15, 2024
    Configuration menu
    Copy the full SHA
    0eba720 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2024

  1. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 16, 2024
    Configuration menu
    Copy the full SHA
    d18b91b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 16, 2024
    Configuration menu
    Copy the full SHA
    f93655d View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 21, 2024
    Configuration menu
    Copy the full SHA
    9bd3062 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 22, 2024
    Configuration menu
    Copy the full SHA
    92b9c4d View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. 删除selectImage.vue中chooseImg下多余的console.log(url) 

    增加emit('getChooseImgUrl', url)返回给父组件获取选中的图片url
    @xue-ding-e
    xue-ding-e committed May 24, 2024
    Configuration menu
    Copy the full SHA
    08f8e85 View commit details
    Browse the repository at this point in the history

  2. Revert "自动化创建代码增加int64和uint(默认id类型)" 

    This reverts commit 5b905c9.
    @xue-ding-e
    xue-ding-e committed May 24, 2024
    Configuration menu
    Copy the full SHA
    ddc87a6 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2024

  1. fixed:修复自动化生成表格缺少的prop (flipped-aurora#1755) 

    * fixed:修复自动化生成表格缺少的prop

---------

Co-authored-by: wall-js <liujun@grectronics.cn>
Co-authored-by: wall-js <wall_js@foxmail.com>
    @wall-js
    3 people committed May 26, 2024
    Configuration menu
    Copy the full SHA
    a6a65ed View commit details
    Browse the repository at this point in the history

  2. Revert "删除selectImage.vue中chooseImg下多余的console.log(url)" 

    This reverts commit 08f8e85.
    @xue-ding-e
    xue-ding-e committed May 26, 2024
    Configuration menu
    Copy the full SHA
    30bf327 View commit details
    Browse the repository at this point in the history

  3. 删除selectImage.vue中chooseImg下多余的console.log(url)

    @xue-ding-e
    xue-ding-e committed May 26, 2024
    Configuration menu
    Copy the full SHA
    1e0ba04 View commit details
    Browse the repository at this point in the history

  4. v2.6.5版本更新 (flipped-aurora#1757) 

    * feature:增加资源加载loading

* feature:修正sql无法落盘的问题

* fixed: 修复切换角色出现404的问题。

* 删除selectImage.vue中chooseImg下多余的console.log(url)

---------

Co-authored-by: krank <emosick@qq.com>
Co-authored-by: Qing Liang <106448173+xue-ding-e@users.noreply.github.com>
    @pixelmaxQm @krank666 @xue-ding-e
    3 people committed May 26, 2024
    Configuration menu
    Copy the full SHA
    02fc503 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'flipped-aurora:main' into main

    @xue-ding-e
    xue-ding-e committed May 26, 2024
    Configuration menu
    Copy the full SHA
    af0196c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'xuedinge' into xuedinge-1

    @xue-ding-e
    xue-ding-e committed May 26, 2024
    Configuration menu
    Copy the full SHA
    b2bf5fe View commit details
    Browse the repository at this point in the history