Commit Graph

21 Commits

Author SHA1 Message Date
li
443cda8e04 fix: 2022-08-31 15:25:45 +08:00
li
7beb572b61 fix:回收卡 2022-08-12 10:41:33 +08:00
li
226143f6cd fix: 2022-06-03 11:30:03 +08:00
li
a0d61387b8 Merge branch 'dev_wx_pay' into mall
# Conflicts:
#	model/autogenerated_mall.go
2022-05-30 14:23:04 +08:00
li
1944391ccf fix: 2022-05-28 15:24:17 +08:00
li
562f534039 fix: 2022-05-28 14:23:52 +08:00
li
f807a5ed89 fix: 2022-05-28 14:18:27 +08:00
li
f3a8ac8a55 fix: 2022-05-12 13:42:45 +08:00
li
d8dc78f590 fix: 2022-04-25 13:59:56 +08:00
li
3bc349cf5f fix:修改 2022-04-21 17:03:33 +08:00
li
a8fdb04881 fix: 2022-04-04 19:03:22 +08:00
li
60d0bcb8b0 fix:会员共享卡 2022-03-26 11:25:15 +08:00
li
ed8892088b Merge branch 'dev_member' into dev_mall_member
# Conflicts:
#	controller/game_card.go
#	lib/status/status.go
#	lib/wxpay/wx_pay.go
#	model/autogenerated_user.go
#	model/model_test.go
#	model/user.go
#	router/router_app.go
2022-03-08 12:08:04 +08:00
li
22a2eccebe fix:积分商城 2022-03-07 14:14:05 +08:00
li
2c672c795f fix: 2022-01-29 10:21:38 +08:00
li
75b20230c6 fix: 2022-01-27 22:24:29 +08:00
li
b7f3bcac3d fix: 2022-01-15 21:21:05 +08:00
li
b5972292ab fix: 2022-01-15 21:10:00 +08:00
li
8575db059a fix: 2021-12-25 16:38:30 +08:00
li
8a9a81ada0 fix: 2021-11-01 11:32:23 +08:00
li
8e44f50992 initail 2021-06-30 10:12:05 +08:00