Commits · b1c903cad672d2adf7daa9ba40339cdfabc7e521 · licc / volunteer_service

29 Mar, 2021 2 commits
- Merge remote-tracking branch 'origin/master' · b1c903ca
  cy authored Mar 29, 2021
```
# Conflicts:
#	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/PayController.java
```
  b1c903ca
- 微信支付 · ed7dd05d
  cy authored Mar 29, 2021
  
  ed7dd05d
26 Mar, 2021 11 commits
- 微信支付 · 987ca904
  cy authored Mar 26, 2021
  
  987ca904
- 优化方案查询 · 61e34c1b
  licc authored Mar 26, 2021
  
  61e34c1b
- 展示不完整方案，优化 · 3fdd0a02
  licc authored Mar 26, 2021
  
  3fdd0a02
- 设置查询时间 · dc3bab05
  licc authored Mar 26, 2021
  
  dc3bab05
- 设置方案查询时间 · aee1d2c6
  licc authored Mar 26, 2021
  
  aee1d2c6
- 修改最低分字段为double · 3d3240ec
  licc authored Mar 26, 2021
  
  3d3240ec
- 支付，广告填加标题字段 · 90886fbc
  cy authored Mar 26, 2021
  
  90886fbc
- Merge remote-tracking branch 'origin/master' · 8f981d4f
  cy authored Mar 26, 2021
```
# Conflicts:
#	wisenergy-service/src/main/java/cn/wisenergy/service/common/VolunteerManager.java
```
  8f981d4f
- 支付，广告填加标题字段 · 741523ea
  cy authored Mar 26, 2021
  
  741523ea
- 修改方案上传不是文化类，无最低位次 · 196e8c29
  licc authored Mar 26, 2021
  
  196e8c29
- 修改方案上传不是文化类，无最低位次 · 078b4ae0
  licc authored Mar 26, 2021
  
  078b4ae0
23 Mar, 2021 5 commits
- 支付 · 805089bc
  cy authored Mar 23, 2021
  
  805089bc
- 支付 · cded8a06
  cy authored Mar 23, 2021
  
  cded8a06
- 支付 · 5fddc76c
  cy authored Mar 23, 2021
  
  5fddc76c
- 支付 · 74f70bb1
  cy authored Mar 23, 2021
  
  74f70bb1
- 支付 · 58088c9c
  cy authored Mar 23, 2021
  
  58088c9c
12 Mar, 2021 1 commit
- 方案导出格式修改 · 485518ed
  liaoanyuan authored Mar 12, 2021
  
  485518ed
10 Mar, 2021 2 commits
- 增加vip客户信息导出功能 · de2b0576
  liaoanyuan authored Mar 10, 2021
  
  de2b0576
- 修改添加vip客户功能 · 7b5faac3
  liaoanyuan authored Mar 10, 2021
  
  7b5faac3
09 Mar, 2021 2 commits
- 修改查询方案（专科体育） · 0cfe090e
  liaoanyuan authored Mar 09, 2021
  
  0cfe090e
- 增加私人订制方案查询功能1 · 9f66456b
  liaoanyuan authored Mar 09, 2021
  
  9f66456b
08 Mar, 2021 1 commit
- 增加员工管理相应功能 · 18d1302e
  liaoanyuan authored Mar 08, 2021
  
  18d1302e
04 Mar, 2021 1 commit
- 修改短信验证重置密码模板号 · 633d57e4
  liaoanyuan authored Mar 04, 2021
  
  633d57e4
03 Mar, 2021 1 commit
- 文件上传文件名称修改 · 0d0b9906
  liaoanyuan authored Mar 03, 2021
  
  0d0b9906
01 Mar, 2021 1 commit
- 用户列表导出功能修改 · 3181f651
  liaoanyuan authored Mar 01, 2021
  
  3181f651
27 Feb, 2021 2 commits
- 方案Excel导出功能修改 · e9af1822
  liaoanyuan authored Feb 27, 2021
  
  e9af1822
- 管理端方案删除功能修改 · 1b5cad91
  liaoanyuan authored Feb 27, 2021
  
  1b5cad91
26 Feb, 2021 5 commits
- 修改个人信息编辑4 · 8bbd5198
  licc authored Feb 26, 2021
  
  8bbd5198
- 增加用户信息导出功能 · 025bd0fb
  liaoanyuan authored Feb 26, 2021
  
  025bd0fb
- 修改个人信息编辑3 · 6b1f8929
  licc authored Feb 26, 2021
  
  6b1f8929
- 修改个人信息编辑2 · 404aa6a1
  licc authored Feb 26, 2021
  
  404aa6a1
- 修改个人信息编辑 · e6ffa7e1
  licc authored Feb 26, 2021
  
  e6ffa7e1
25 Feb, 2021 1 commit
- 进行支付宝和微信支付与查询次数的串联 · 18e64597
  liaoanyuan authored Feb 25, 2021
  
  18e64597
24 Feb, 2021 4 commits
- 添加支付宝service层和发送短信验证码签名修改 · 4b403421
  liaoanyuan authored Feb 24, 2021
  
  4b403421
- 修改方案查询 · 2b174d40
  licc authored Feb 24, 2021
  
  2b174d40
- redis ip地址修改 · 0fae4a8c
  liaoanyuan authored Feb 24, 2021
  
  0fae4a8c
- 修改专业获取 · 1c036f4c
  licc authored Feb 24, 2021
  
  1c036f4c
23 Feb, 2021 1 commit
- 短信验证码增加短信验证模板号 · 0ec5d3f3
  liaoanyuan authored Feb 23, 2021
  
  0ec5d3f3