Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
ZhangJianFrontEnd
ZhangJianFrontEnd
  • Overview
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • vue-project
  • ZhangJian
  • ZhangJianFrontEndZhangJianFrontEnd
  • Merge Requests
  • !55

Merged
Opened Nov 17, 2021 by xiaxiansheng@Xiaxs 
  • Report abuse
Report abuse

cbfd1e40

合并分支 20210819 => master - 2021.11.17

  • Discussion 0
  • Commits 168
  • Changes 75
{{ resolvedDiscussionCount }}/{{ discussionCount }} {{ resolvedCountText }} resolved
  • wangdongchen
    @wangbangchen started a discussion on commit a5c0cc5a Aug 11, 2021
    Last updated by wangdongchen Aug 11, 2021
    • wangdongchen @wangbangchen

      mentioned in commit 5968f57d

      Aug 11, 2021

      mentioned in commit 5968f57d

      mentioned in commit 5968f57d28806081621ca7f694ac50e7dd226cff
      Toggle commit list
    • wangdongchen @wangbangchen

      mentioned in commit e27c2407

      Aug 11, 2021

      mentioned in commit e27c2407

      mentioned in commit e27c24070c6555273765199a84f9e91be97fbbde
      Toggle commit list
    Please register or sign in to reply
  • wangdongchen
    @wangbangchen started a discussion on commit f2ead030 Aug 11, 2021
    • wangdongchen @wangbangchen

      mentioned in commit dcf43fe8

      Aug 11, 2021

      mentioned in commit dcf43fe8

      mentioned in commit dcf43fe8508df5cbf62aaf25e4b6d63ff4bdf481
      Toggle commit list
    Please register or sign in to reply
  • wangyui2025
    @wangyui2025 started a discussion on commit 059c602d Aug 12, 2021
    Last updated by wangyui2025 Aug 12, 2021
    • wangyui2025 @wangyui2025

      mentioned in commit 425d6528

      Aug 12, 2021

      mentioned in commit 425d6528

      mentioned in commit 425d652866958b01301c08acb25f14ada2e45d00
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 4503614c

      Aug 12, 2021

      mentioned in commit 4503614c

      mentioned in commit 4503614c8ef8929177915abfc87f52ec2fb0b078
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 1b6c8504

      Aug 12, 2021

      mentioned in commit 1b6c8504

      mentioned in commit 1b6c850427f0a63006876c5c8eeca854b5fbbb84
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 75c9ec2f

      Aug 12, 2021

      mentioned in commit 75c9ec2f

      mentioned in commit 75c9ec2f1eb9dfc664966d200b0271c465b21aa3
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 26710eae

      Aug 12, 2021

      mentioned in commit 26710eae

      mentioned in commit 26710eaebb8e05fb3ee86f4e5fad8aa53e70676b
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 5aced701

      Aug 12, 2021

      mentioned in commit 5aced701

      mentioned in commit 5aced701c45eb59aeed49633abe28cd250de8691
      Toggle commit list
    Please register or sign in to reply
  • xiaxiansheng
    @Xiaxs started a discussion on commit f29da1ca Aug 12, 2021
    • xiaxiansheng @Xiaxs

      mentioned in commit 09e5419f

      Aug 12, 2021

      mentioned in commit 09e5419f

      mentioned in commit 09e5419fb382c8b9d3a1532f87bfffa309da6b1c
      Toggle commit list
    Please register or sign in to reply
  • yuanfeng
    @yuanfeng started a discussion on commit 9d37e5ee Aug 16, 2021
    • yuanfeng @yuanfeng

      mentioned in commit 599bd4fc

      Aug 16, 2021

      mentioned in commit 599bd4fc

      mentioned in commit 599bd4fc9325953a6235a682723de79447afb563
      Toggle commit list
    Please register or sign in to reply
  • yuanfeng
    @yuanfeng started a discussion on commit 98614967 Aug 16, 2021
    • yuanfeng @yuanfeng

      mentioned in commit 2dc415cf

      Aug 16, 2021

      mentioned in commit 2dc415cf

      mentioned in commit 2dc415cfebeacaae891cec8769bae4b3519f2b97
      Toggle commit list
    Please register or sign in to reply
  • yuanfeng
    @yuanfeng started a discussion on commit 263970f1 Aug 16, 2021
    • yuanfeng @yuanfeng

      mentioned in commit 40533879

      Aug 16, 2021

      mentioned in commit 40533879

      mentioned in commit 40533879db0c1bea2030b9549b48c8e39bad42cb
      Toggle commit list
    Please register or sign in to reply
  • yuanfeng
    @yuanfeng started a discussion on commit 33ac272d Aug 17, 2021
    • yuanfeng @yuanfeng

      mentioned in commit 8dd15c5d

      Aug 17, 2021

      mentioned in commit 8dd15c5d

      mentioned in commit 8dd15c5d4e483e03e290696bc59498572f4da4f6
      Toggle commit list
    Please register or sign in to reply
  • xiaxiansheng
    @Xiaxs started a discussion on commit dbfb39de Aug 17, 2021
    Last updated by yuanfeng Aug 17, 2021
    • xiaxiansheng @Xiaxs

      mentioned in commit d0279067

      Aug 17, 2021

      mentioned in commit d0279067

      mentioned in commit d0279067439166fb80ff39d05dd150f74471a301
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 8c86ce11

      Aug 17, 2021

      mentioned in commit 8c86ce11

      mentioned in commit 8c86ce11924a40000b03f842c7146b2722af5b10
      Toggle commit list
    Please register or sign in to reply
  • xiaxiansheng @Xiaxs

    added 3 commits

    • cbfd1e40...7785455d - 2 commits from branch master
    • 94c3b638 - 合并分支 `94c3b638` => `master` - 2021.11.17

    Compare with previous version

    Nov 17, 2021

    added 3 commits

    • cbfd1e40...7785455d - 2 commits from branch master
    • 94c3b638 - 合并分支 `94c3b638` => `master` - 2021.11.17

    Compare with previous version

    added 3 commits <ul><li>cbfd1e40...7785455d - 2 commits from branch <code>master</code></li><li>94c3b638 - 合并分支 `20210819` =&gt; `master` - 2021.11.17</li></ul> [Compare with previous version](http://123.207.147.179:8888/vue-project/liangXing/frontEnd/merge_requests/55/diffs?diff_id=1365&start_sha=cbfd1e40afce0fbf4ba0c49ac42c9fa45eaae9d0)
    Toggle commit list
  • xiaxiansheng
    @Xiaxs started a discussion on commit 94c3b638 Nov 17, 2021
    Last updated by xiaxiansheng Nov 17, 2021
    • xiaxiansheng @Xiaxs

      mentioned in commit 75c9ec2f

      Nov 17, 2021

      mentioned in commit 75c9ec2f

      mentioned in commit 75c9ec2f1eb9dfc664966d200b0271c465b21aa3
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 26710eae

      Nov 17, 2021

      mentioned in commit 26710eae

      mentioned in commit 26710eaebb8e05fb3ee86f4e5fad8aa53e70676b
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 5968f57d

      Nov 17, 2021

      mentioned in commit 5968f57d

      mentioned in commit 5968f57d28806081621ca7f694ac50e7dd226cff
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 09e5419f

      Nov 17, 2021

      mentioned in commit 09e5419f

      mentioned in commit 09e5419fb382c8b9d3a1532f87bfffa309da6b1c
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit d3ce4bbc

      Nov 17, 2021

      mentioned in commit d3ce4bbc

      mentioned in commit d3ce4bbc0720df7dec79c94cbc8ae2fbe2b7ba8d
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 1b6c8504

      Nov 17, 2021

      mentioned in commit 1b6c8504

      mentioned in commit 1b6c850427f0a63006876c5c8eeca854b5fbbb84
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit dcf43fe8

      Nov 17, 2021

      mentioned in commit dcf43fe8

      mentioned in commit dcf43fe8508df5cbf62aaf25e4b6d63ff4bdf481
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 599bd4fc

      Nov 17, 2021

      mentioned in commit 599bd4fc

      mentioned in commit 599bd4fc9325953a6235a682723de79447afb563
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 425d6528

      Nov 17, 2021

      mentioned in commit 425d6528

      mentioned in commit 425d652866958b01301c08acb25f14ada2e45d00
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 4503614c

      Nov 17, 2021

      mentioned in commit 4503614c

      mentioned in commit 4503614c8ef8929177915abfc87f52ec2fb0b078
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 5aced701

      Nov 17, 2021

      mentioned in commit 5aced701

      mentioned in commit 5aced701c45eb59aeed49633abe28cd250de8691
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 2dc415cf

      Nov 17, 2021

      mentioned in commit 2dc415cf

      mentioned in commit 2dc415cfebeacaae891cec8769bae4b3519f2b97
      Toggle commit list
    • wangdongchen @wangbangchen

      mentioned in commit 18449c52

      Nov 17, 2021

      mentioned in commit 18449c52

      mentioned in commit 18449c525886a27663bc3f698d6982841a59eba3
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 9d37e5ee

      Nov 17, 2021

      mentioned in commit 9d37e5ee

      mentioned in commit 9d37e5ee4e9ffd80793ce9508ae8f31c348e6faa
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 9c42ba65

      Nov 17, 2021

      mentioned in commit 9c42ba65

      mentioned in commit 9c42ba65be8d213645c5be2362958f34d373f642
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 7cb54ef4

      Nov 17, 2021

      mentioned in commit 7cb54ef4

      mentioned in commit 7cb54ef45b43a4ad36754865dd2c53325df90615
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 8dd15c5d

      Nov 17, 2021

      mentioned in commit 8dd15c5d

      mentioned in commit 8dd15c5d4e483e03e290696bc59498572f4da4f6
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit d0279067

      Nov 17, 2021

      mentioned in commit d0279067

      mentioned in commit d0279067439166fb80ff39d05dd150f74471a301
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 40533879

      Nov 17, 2021

      mentioned in commit 40533879

      mentioned in commit 40533879db0c1bea2030b9549b48c8e39bad42cb
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 8c86ce11

      Nov 17, 2021

      mentioned in commit 8c86ce11

      mentioned in commit 8c86ce11924a40000b03f842c7146b2722af5b10
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit b3e14fbc

      Nov 17, 2021

      mentioned in commit b3e14fbc

      mentioned in commit b3e14fbc6bb03594429ee3106d57df58d58ea600
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 8631696d

      Nov 17, 2021

      mentioned in commit 8631696d

      mentioned in commit 8631696deca5b4029bc38895cd50b715c8974c48
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit a5c0cc5a

      Nov 17, 2021

      mentioned in commit a5c0cc5a

      mentioned in commit a5c0cc5aaf05bb7689e6b6e51d5bc47abf82d205
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 98614967

      Nov 17, 2021

      mentioned in commit 98614967

      mentioned in commit 98614967c983fa5b03aa3221026ba9e308b96f48
      Toggle commit list
    • wangyui2025 @wangyui2025

      mentioned in commit 5d5fae90

      Nov 17, 2021

      mentioned in commit 5d5fae90

      mentioned in commit 5d5fae90328a3d479ed80b5ec5ce016e1ce4b447
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 263970f1

      Nov 17, 2021

      mentioned in commit 263970f1

      mentioned in commit 263970f1db44fbf77ecf035105ed59ff82b84f62
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit f2ead030

      Nov 17, 2021

      mentioned in commit f2ead030

      mentioned in commit f2ead030e90436a48d22012878a55ccc26e1d811
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 2d308c34

      Nov 17, 2021

      mentioned in commit 2d308c34

      mentioned in commit 2d308c341a54a49d7e696172d8175cd7f32b5a66
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 5e997f0f

      Nov 17, 2021

      mentioned in commit 5e997f0f

      mentioned in commit 5e997f0fc100d108a2fb31eb644507ea6f4adce8
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit b43771ba

      Nov 17, 2021

      mentioned in commit b43771ba

      mentioned in commit b43771bad0be00fe0c6990268e076a672c3ef4bb
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 75d2f6c6

      Nov 17, 2021

      mentioned in commit 75d2f6c6

      mentioned in commit 75d2f6c611f5d1cba61193aeb0aac8eaa64dd974
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 6f671610

      Nov 17, 2021

      mentioned in commit 6f671610

      mentioned in commit 6f671610a660c787650cadac8177e7373ca8f932
      Toggle commit list
    • yuanfeng @yuanfeng

      mentioned in commit 6ecdf42c

      Nov 17, 2021

      mentioned in commit 6ecdf42c

      mentioned in commit 6ecdf42cc0f15c621b2c5be406faf39a3fc9ab05
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit e2430735

      Nov 17, 2021

      mentioned in commit e2430735

      mentioned in commit e2430735c09b01623e10db5281c0e2026fa9c749
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 3c9c3909

      Nov 17, 2021

      mentioned in commit 3c9c3909

      mentioned in commit 3c9c39095f0cbf55afbf36fc4c1a959d4a10c2a0
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 9f1560ca

      Nov 17, 2021

      mentioned in commit 9f1560ca

      mentioned in commit 9f1560caa20f0e347fdad8a89bf84a818a9df06d
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 7ea32fe6

      Nov 17, 2021

      mentioned in commit 7ea32fe6

      mentioned in commit 7ea32fe64c00d4625b0f254bb24e875d7c7544ba
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 8fa94fd1

      Nov 17, 2021

      mentioned in commit 8fa94fd1

      mentioned in commit 8fa94fd1911fa3ef5829b66e28313c3a80c91883
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 3346eaca

      Nov 17, 2021

      mentioned in commit 3346eaca

      mentioned in commit 3346eaca1c70b394520f812dadc6003f2ee9a20a
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 14f674a9

      Nov 17, 2021

      mentioned in commit 14f674a9

      mentioned in commit 14f674a9b9d8fa313699c07a35696d2acad54f8c
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit 5d28f76c

      Nov 17, 2021

      mentioned in commit 5d28f76c

      mentioned in commit 5d28f76ceac80e8f29d363cb41f0993db57bfea3
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit f5302b85

      Nov 17, 2021

      mentioned in commit f5302b85

      mentioned in commit f5302b85358d1564bc48c484387750f6667cfcc4
      Toggle commit list
    • yangyang19979 @yangyang19979

      mentioned in commit edbb7b17

      Nov 17, 2021

      mentioned in commit edbb7b17

      mentioned in commit edbb7b174e2506bf973bcf125744d7d41f75b24b
      Toggle commit list
    • xiaxiansheng @Xiaxs

      mentioned in commit 5dccd570

      Nov 17, 2021

      mentioned in commit 5dccd570

      mentioned in commit 5dccd570bf8e0e394b3938f62e8f5aa360d576a6
      Toggle commit list
    Please register or sign in to reply
  • xiaxiansheng @Xiaxs

    merged

    Nov 17, 2021

    merged

    merged
    Toggle commit list
  • xiaxiansheng @Xiaxs

    mentioned in commit 5dccd570

    Nov 17, 2021

    mentioned in commit 5dccd570

    mentioned in commit 5dccd570bf8e0e394b3938f62e8f5aa360d576a6
    Toggle commit list
  • Write
  • Preview
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment
xiaxiansheng
Assignee
xiaxiansheng @Xiaxs
Assign to
None
Milestone
None
Assign milestone
Time tracking
Reference: vue-project/ZhangJian/ZhangJianFrontEnd!55
×

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.
×

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.