Commit History

Author SHA1 Message Date
  zouxuan a5ae9c6180 Merge branch 'zouxuan' of http://git.dayaedu.com/yonge/cooleshow 3 years ago
  zouxuan f92abd8a67 设备号 3 years ago
  liujunchi 5281fbcd7a Merge branch 'ljc_1.1' 3 years ago
  liujunchi ceeea7ec26 Merge branch 'ljc_teacherBuyVip_20220721' into ljc_1.1 3 years ago
  liujunchi bc815b7c94 add:老师会员过期时间 3 years ago
  liujunchi 844857cd89 add:商城平台收入 3 years ago
  liujunchi 8224f39057 fix:merge 3 years ago
  liweifan 14ba4c02e0 订单退款后处理平台账户逻辑 3 years ago
  yonge ec8f29c0cb update 3 years ago
  liujunchi 1320615175 商城分润 3 years ago
  liweifan b125fd11b9 解决冲突 3 years ago
  liweifan a83bfbed57 Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720 3 years ago
  yonge 0d474a88c3 update:add task 3 years ago
  yonge d8de457a0d update:平台收入 3 years ago
  liweifan 7cb66c6c82 fix 3 years ago
  liweifan a3d784f353 老师账户统计 3 years ago
  liweifan 446025aef3 解决冲突 3 years ago
  yonge f3c7d6f2d9 update:add task 3 years ago
  yonge 7c7c3bfd52 update:平台收入 3 years ago
  yonge d88bb2ac98 Merge branch 'dev_v1_1_20220720' of http://git.dayaedu.com/yonge/cooleshow into dev_v1_1_20220720 3 years ago
  yonge 3075bb3b64 update:add task 3 years ago
  liweifan 77b8274eac 老师账户统计 3 years ago
  liweifan e296c286e6 老师分润 3 years ago
  zouxuan ea4c8d2a5c Merge remote-tracking branch 'origin/master' 3 years ago
  zouxuan 04a1da8adc Merge branch 'zouxuan' of http://git.dayaedu.com/yonge/cooleshow 3 years ago
  zouxuan a71f7ae4ce 设备号 3 years ago
  liujunchi 6dc0c034f9 Merge branch 'ljc_1.1' 3 years ago
  liujunchi 114d23989f fix:老师会员展示 3 years ago
  yonge ed01ff1ebe update:平台收入 3 years ago
  liujunchi 1e504e732c merge 3 years ago