Commits · 883de6eadedf4bf6f23efa2f612d2c4e326c709b · zhouqian / vue-gjjs · GitLab

20 Sep, 2022 11 commits
- 优惠调整补充 · 883de6ea
  liuxin authored Sep 20, 2022
  
  883de6ea Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · e5afe068
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liuxin authored Sep 20, 2022
  e5afe068 Browse Files
- 账务拆账详情与优惠调整 · 8bf0f4d6
  liuxin authored Sep 20, 2022
  
  8bf0f4d6 Browse Files
- 面函Docpan.vue中点Detail操作按钮弹出Dialog页面中的Suppress/Activate按钮事件 · bbac7d80
  lianyang authored Sep 20, 2022
  
  bbac7d80 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · f6133ae0
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  wangna authored Sep 20, 2022
  f6133ae0 Browse Files
- gitcom修改（#863） · 5904f5c9
  wangna authored Sep 20, 2022
  
  5904f5c9 Browse Files
- gitpop bug(861) · 5b7f1d33
  liyixun authored Sep 20, 2022
  
  5b7f1d33 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 5c3aeb14
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liyixun authored Sep 20, 2022
  5c3aeb14 Browse Files
- gitpop bug(860) 及bttset页面布局 · ca4a071d
  liyixun authored Sep 20, 2022
  
  ca4a071d Browse Files
- GitXXX交易快照添加 · e832cf68
  panziyi authored Sep 20, 2022
  
  e832cf68 Browse Files
- lttdav交易页面布局，交易bug修改 · a8a341e7
  Wuyuqiu authored Sep 20, 2022
  
  a8a341e7 Browse Files
19 Sep, 2022 20 commits
- letopn公共页面Docpan.vue中detail按钮弹出页中的supress/active按钮 · b5ca9327
  lianyang authored Sep 19, 2022
  
  b5ca9327 Browse Files
- Gitcrj修改 · d109df65
  panziyi authored Sep 19, 2022
  
  d109df65 Browse Files
- 解决冲突 · ffb7dc6f
  nanrui authored Sep 19, 2022
  
  ffb7dc6f Browse Files
- 合并冲突 · c719986b
  nanrui authored Sep 19, 2022
  
  c719986b Browse Files
- 合并冲突 · 0beebc02
  liyixun authored Sep 19, 2022
  
  0beebc02 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 24c2d259
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liyixun authored Sep 19, 2022
  24c2d259 Browse Files
- bttset初始化 · 3a220aa3
  liyixun authored Sep 19, 2022
  
  3a220aa3 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 3befceb5
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  nanrui authored Sep 19, 2022
  3befceb5 Browse Files
- Bctset修改 · 5ff75dab
  panziyi authored Sep 19, 2022
  
  5ff75dab Browse Files
- cltset,clttra快照处理 · 446cb040
  nanrui authored Sep 19, 2022
  
  446cb040 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 397a12b5
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liyixun authored Sep 19, 2022
  397a12b5 Browse Files
- bttcrl文本类回填组件 · f4d4f922
  liyixun authored Sep 19, 2022
  
  f4d4f922 Browse Files
- Gitset添加 · a77ef43d
  panziyi authored Sep 19, 2022
  
  a77ef43d Browse Files
- Merge remote-tracking branch 'origin/development-202206' into development-202206 · 3a78efe7
```
# Conflicts:
#	src/views/Review/ReviewRouter.js
```
  panziyi authored Sep 19, 2022
  3a78efe7 Browse Files
- Gitset修改 · 7d70f0dc
  panziyi authored Sep 19, 2022
  
  7d70f0dc Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 3d5543c7
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  wangna authored Sep 19, 2022
  3d5543c7 Browse Files
- cctset界面布局修改 · 44432de7
  wangna authored Sep 19, 2022
  
  44432de7 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 83b0c140
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liyixun authored Sep 19, 2022
  83b0c140 Browse Files
- bttrcl 交易快照和复核处理 · b138eb2a
  liyixun authored Sep 19, 2022
  
  b138eb2a Browse Files
- 增加sprtneg菜单 · 3c81ea5f
  zhujiazhan authored Sep 19, 2022
  
  3c81ea5f Browse Files
16 Sep, 2022 9 commits
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · 92bf3c8b
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  jianglong authored Sep 16, 2022
  92bf3c8b Browse Files
- BRTSET，INFBRD界面汉化 · 3d74cd66
  jianglong authored Sep 16, 2022
  
  3d74cd66 Browse Files
- betset初始化未显示问题 · 458d52ef
  Wuyuqiu authored Sep 16, 2022
  
  458d52ef Browse Files
- infbtd交易完成、交易bug修改 · f477b8af
  Wuyuqiu authored Sep 16, 2022
  
  f477b8af Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · f18af754
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  liyixun authored Sep 16, 2022
  f18af754 Browse Files
- bttcrl页面布局 · 8a23da90
  liyixun authored Sep 16, 2022
  
  8a23da90 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · d08376c7
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  “yanyuxin” authored Sep 16, 2022
  d08376c7 Browse Files
- Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs… · c7a2d4e8
```
Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206
```
  “yanyuxin” authored Sep 16, 2022
  c7a2d4e8 Browse Files
- Merge remote-tracking branch 'origin/development-202206' into development-202206 · 444a159b
  sheyinchen authored Sep 16, 2022
  
  444a159b Browse Files