Commit Graph

67 Commits

Author SHA1 Message Date
li
39a1f1f028 fix: 2023-02-09 16:59:06 +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
17c104a1bc fix: 2022-11-24 11:12:12 +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
564c9a5341 fix: 2022-11-18 15:12:09 +08:00
li
caaa9cba41 fix:店员 2022-11-01 14:23:06 +08:00
li
24b6a4a6d4 fix: 2022-10-25 15:06:14 +08:00
li
97a59069ec fix: 2022-10-09 11:12:47 +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
09c0316129 fix: 2022-08-16 15:18:42 +08:00
li
a06eca7cfd fix:管理端回收卡列表 2022-08-15 17:51:41 +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
f4280d733d Merge branch 'mall' into dev_index
# Conflicts:
#	model/model_test.go
2022-06-23 12:23:25 +08:00
li
77038e1c7a fix: 2022-06-23 12:21:01 +08:00
li
688a2173dc fix: 2022-06-14 18:26:53 +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
a3058af533 fix: 2022-05-20 13:54:04 +08:00
li
0ba0080b1d fix: 2022-05-19 15:30:19 +08:00
li
ceea1518e0 fix: 2022-05-18 14:28:00 +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
9198f8b648 Merge branch 'dev_share_card_issue_code' into dev_small_demand 2022-04-24 10:52:55 +08:00
li
6024512362 fix:异常反馈 2022-04-24 10:52:45 +08:00
li
95c7e963bc fix: 2022-04-23 15:47:13 +08:00
li
eb9ee6614b fix:修改用户绑定门店 2022-04-22 10:45:15 +08:00
li
4059e15450 fix: 2022-04-22 09:53:43 +08:00
li
dcac87d0e2 fix:问题反馈 2022-04-21 14:59:12 +08:00
li
30fca5a0a4 Merge branch 'dev_mall_member' into dev_share_card_issue_code 2022-04-19 14:21:33 +08:00
li
128af37e98 fix: 2022-04-19 14:18:21 +08:00
li
a8d9bbb4bd fix:会员兑换码 2022-04-19 09:55:38 +08:00
li
ae7ef8980a fix: 2022-04-16 21:26:14 +08:00