Commit Graph

54 Commits

Author SHA1 Message Date
v_zrlinchen
338b044de6 (1)修改会员升级接口upgrade_member,放开优惠券限制;(2)添加注释;(3)添加Makefile文件 2023-11-30 15:07:08 +08:00
li
d2f17242f0 fix: 2023-09-12 14:54:27 +08:00
li
7e22f0ed55 fix: 2023-07-14 17:29:05 +08:00
li
f34f2c48af fix: 2023-07-10 14:44:36 +08:00
li
e62abdad31 fix: 2023-05-09 11:37:56 +08:00
li
484d1f301e Merge branch 'dev_hm_pay_original' into dev_erp_retail_01 2023-01-06 10:07:51 +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
6d93a6e65d fix: 2023-01-06 10:03:56 +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
54189620be fix: 2022-11-23 16:20:05 +08:00
li
649d240561 fix: 2022-11-22 15:42:48 +08:00
li
caaa9cba41 fix:店员 2022-11-01 14:23:06 +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
d0b4f45d7b Merge branch 'dev_index' into dev_-recycle_card 2022-08-04 11:58:09 +08:00
li
77fa2be613 fix:多次邀请 数据统计 2022-08-04 11:57:21 +08:00
li
5f1dbcaa72 feat:回收卡 2022-08-01 15:14:53 +08:00
li
581633ebe6 fix: 2022-07-29 10:02:33 +08:00
li
0a881f3b03 fix: 2022-07-25 12:02:53 +08:00
li
a07635bf14 fix: 2022-07-12 21:20:57 +08:00
li
c75270892a fix:生成文件 2022-06-29 16:03:50 +08:00
li
77038e1c7a fix: 2022-06-23 12:21:01 +08:00
li
266eb091a1 fix: 2022-06-21 15:34:42 +08:00
li
ff5bcb1c8c fix: 2022-06-14 14:07:15 +08:00
li
226143f6cd fix: 2022-06-03 11:30:03 +08:00
li
f807a5ed89 fix: 2022-05-28 14:18:27 +08:00
li
ceea1518e0 fix: 2022-05-18 14:28:00 +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
510a62fb85 fix:签到领积分 2022-04-26 14:28:41 +08:00
li
d8dc78f590 fix: 2022-04-25 13:59:56 +08:00
li
95c7e963bc fix: 2022-04-23 15:47:13 +08:00
li
30fca5a0a4 Merge branch 'dev_mall_member' into dev_share_card_issue_code 2022-04-19 14:21:33 +08:00
li
a8d9bbb4bd fix:会员兑换码 2022-04-19 09:55:38 +08:00
li
ae7ef8980a fix: 2022-04-16 21:26:14 +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
60d0bcb8b0 fix:会员共享卡 2022-03-26 11:25:15 +08:00
li
9528744d1e fix: 2022-03-08 14:14:24 +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
2b93e9046e fix:多级会员 2022-02-26 14:29:39 +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
li
a0a31709e5 fix: 2022-01-16 16:56:20 +08:00