Commits · 2cdeac4d96149ffcbf70abaea7c4413be6e00485 · haoban3.0 / haoban-manage3.0 · GitLab

05 Sep, 2022 3 commits
- Merge remote-tracking branch 'origin/master_xgh_会员待开发+商户停用' into · 2cdeac4d
```
master-xgh-好办停用

Conflicts:
	haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/StoreController.java
```
  徐高华 authored Sep 05, 2022
  2cdeac4d Browse Files
- log · ae231b39
  徐高华 authored Sep 05, 2022
  
  ae231b39 Browse Files
- 好办停用 · ffeddfa8
  徐高华 authored Sep 05, 2022
  
  ffeddfa8 Browse Files
03 Sep, 2022 9 commits
- 商户停用 · dd439d3f
  徐高华 authored Sep 03, 2022
  
  dd439d3f Browse Files
- 好办停用 · 22c495fd
  徐高华 authored Sep 03, 2022
  
  22c495fd Browse Files
- 删除好办定时 · bd4c711e
  徐高华 authored Sep 03, 2022
  
  bd4c711e Browse Files
- 好办mq · 3f20c8ee
  徐高华 authored Sep 03, 2022
  
  3f20c8ee Browse Files
- 删除好办 · d487f103
  徐高华 authored Sep 03, 2022
  
  d487f103 Browse Files
- 过期停用 · 188d9319
  徐高华 authored Sep 03, 2022
  
  188d9319 Browse Files
- 商户停用 · bc5645be
  徐高华 authored Sep 03, 2022
  
  bc5645be Browse Files
- 好办停用 · 83a4b71e
  徐高华 authored Sep 03, 2022
  
  83a4b71e Browse Files
- 好办停用 · 949dfb0d
  徐高华 authored Sep 03, 2022
  
  949dfb0d Browse Files
02 Sep, 2022 9 commits
- 好办停用 · 4e2e729d
  徐高华 authored Sep 02, 2022
  
  4e2e729d Browse Files
- 好办停用 · 206b528b
  徐高华 authored Sep 02, 2022
  
  206b528b Browse Files
- 删除无用代码 · cfa8c0dc
  徐高华 authored Sep 02, 2022
  
  cfa8c0dc Browse Files
- 停用商户-删除好办定时 · 8fedb40a
  徐高华 authored Sep 02, 2022
  
  8fedb40a Browse Files
- 商户过滤 · 466c0123
  徐高华 authored Sep 02, 2022
  
  466c0123 Browse Files
- 会员小程序过滤不是当前企业的门店 · 11d9f131
  徐高华 authored Sep 02, 2022
  
  11d9f131 Browse Files
- 商户停用 · dd57269b
  徐高华 authored Sep 02, 2022
  
  dd57269b Browse Files
- 好办停用 · 70442744
  徐高华 authored Sep 02, 2022
  
  70442744 Browse Files
- 会员小程序 · 44cafeb7
  徐高华 authored Sep 02, 2022
  
  44cafeb7 Browse Files
01 Sep, 2022 10 commits
- Merge branch 'fixbug_0901' into 'master' · 5274e109
```
Fixbug 0901

See merge request !210
```
  徐高华 authored Sep 01, 2022
  5274e109 Browse Files
- 群发 · fcb5c3c7
  徐高华 authored Sep 01, 2022
  
  fcb5c3c7 Browse Files
- 非空判断 · 14d929de
  徐高华 authored Sep 01, 2022
  
  14d929de Browse Files
- 会员代开发 · 21ea3b53
  徐高华 authored Sep 01, 2022
  
  21ea3b53 Browse Files
- Merge remote-tracking branch 'origin/fixbug_0901' into fixbug_0901 · dec73004
  墨竹 authored Sep 01, 2022
  
  dec73004 Browse Files
- fix:代码优化 · a4af1381
  墨竹 authored Sep 01, 2022
  
  a4af1381 Browse Files
- sql优化 · 92e88e37
  徐高华 authored Sep 01, 2022
  
  92e88e37 Browse Files
- 删除多余字段 · 98def3b4
  徐高华 authored Sep 01, 2022
  
  98def3b4 Browse Files
- fix:上传文件名字修改 · 3b9cdcb8
  墨竹 authored Sep 01, 2022
  
  3b9cdcb8 Browse Files
- fix:上传文件名字修改 · 4be19ace
  墨竹 authored Sep 01, 2022
  
  4be19ace Browse Files
31 Aug, 2022 1 commit
- fix：收费列表增加判断 · e1878dfb
  墨竹 authored Aug 31, 2022
  
  e1878dfb Browse Files
30 Aug, 2022 8 commits
- fix:去除定时任务修改员工更新时间 · def6f2ed
  墨竹 authored Aug 31, 2022
  
  def6f2ed Browse Files
- Merge remote-tracking branch 'origin/master' · 31b602e5
  墨竹 authored Aug 31, 2022
  
  31b602e5 Browse Files
- fix:创建更新活码失败，日志不计 · 7f9c8c73
  墨竹 authored Aug 31, 2022
  
  7f9c8c73 Browse Files
- Merge branch 'developer' into 'master' · 5850fef2
```
Developer

See merge request !208
```
  徐高华 authored Aug 30, 2022
  5850fef2 Browse Files
- log · 91c8b159
  徐高华 authored Aug 30, 2022
  
  91c8b159 Browse Files
- 加密类型 · bc459a0c
  徐高华 authored Aug 30, 2022
  
  bc459a0c Browse Files
- Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0 · 780b3059
  墨竹 authored Aug 30, 2022
  
  780b3059 Browse Files
- fix:清理无效配置 · 14b0149c
  墨竹 authored Aug 30, 2022
  
  14b0149c Browse Files