Commit Graph

51 Commits

Author SHA1 Message Date
范俊成
3a5eb93919 修改闲麦地址 2023-09-19 10:53:59 +08:00
li
d2f17242f0 fix: 2023-09-12 14:54:27 +08:00
li
9956caeaba fix: 2023-08-25 09:53:23 +08:00
li
920b0a8450 fix: 2023-08-01 10:23:00 +08:00
li
45daca467a Merge branch 'dev_coupon' into dev_hm_pay_original
# Conflicts:
#	model/model_test.go
2023-01-06 10:07:23 +08:00
li
932fcf597f fix: 2022-12-13 14:11:54 +08:00
li
a01e8fdfd2 fix: 2022-11-30 09:43:36 +08:00
li
81e54ea039 fix: 2022-11-26 16:52:05 +08:00
li
2e8ea731ab fix: 2022-11-24 17:56:21 +08:00
li
09685704f5 fix: 2022-11-23 10:10:14 +08:00
li
7ebc4ec589 fix: 2022-11-22 15:50:54 +08:00
li
649d240561 fix: 2022-11-22 15:42:48 +08:00
li
564c9a5341 fix: 2022-11-18 15:12:09 +08:00
li
caaa9cba41 fix:店员 2022-11-01 14:23:06 +08:00
li
00c1972fb5 fix: 2022-10-13 17:20:52 +08:00
li
9aef50f49a fix: 2022-10-13 14:51:34 +08:00
li
c4d5ac06d8 feat:运费包 2022-09-29 15:49:16 +08:00
li
443cda8e04 fix: 2022-08-31 15:25:45 +08:00
li
7beb572b61 fix:回收卡 2022-08-12 10:41:33 +08:00
li
5f1dbcaa72 feat:回收卡 2022-08-01 15:14:53 +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
3670b91603 fix: 2022-05-13 17:35:10 +08:00
li
f3a8ac8a55 fix: 2022-05-12 13:42:45 +08:00
li
133ed7db4b fix: 2022-05-10 15:17:34 +08:00
li
c556a306f1 fix: 2022-04-27 10:25:55 +08:00
li
510a62fb85 fix:签到领积分 2022-04-26 14:28:41 +08:00
li
d8dc78f590 fix: 2022-04-25 13:59:56 +08:00
li
56f661b70d fix: 2022-04-24 15:13:20 +08:00
li
3bc349cf5f fix:修改 2022-04-21 17:03:33 +08:00
li
dcac87d0e2 fix:问题反馈 2022-04-21 14:59:12 +08:00
li
73013ed758 fix: 2022-04-18 13:50:31 +08:00
li
a6689f2ad1 fix: 2022-04-08 10:28:50 +08:00
li
a8fdb04881 fix: 2022-04-04 19:03:22 +08:00
li
bfdbe458d1 fix: 2022-04-02 15:55:23 +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
0a4c7f2c4b fix: 2022-01-26 16:02:21 +08:00
ekko
8bdb3ee683 feat: mall api 2022-01-16 16:56:33 +08:00
li
a0a31709e5 fix: 2022-01-16 16:56:20 +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