Commit Graph

461 Commits

Author SHA1 Message Date
c97f3c655f Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:10:42 +08:00
fd715b51a8 feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 18:10:10 +08:00
c0d46d3b7b Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:35:00 +08:00
829f86908f feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-05 05:34:46 +08:00
b87ae167bb Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-01 21:43:42 +08:00
736675608a mod(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-08-01 21:43:10 +08:00
1306e2acf6 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 15:12:03 +08:00
3782abcd2e feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-29 15:11:50 +08:00
11386f9864 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:47:07 +08:00
3f11741c33 feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-28 10:46:54 +08:00
592fb2ede7 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-22 18:23:11 +08:00
2f11eae9d2 mod(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-07-22 18:22:51 +08:00
f868be28a3 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:08:18 +08:00
10ed1bb6d6 feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-20 16:08:04 +08:00
346930fac9 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-17 18:48:56 +08:00
df796d6a1d fix(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-17 18:48:33 +08:00
0744da45f6 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-17 18:16:01 +08:00
f899201e4a fix(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-05-17 18:15:49 +08:00
981fff22de fix(custom): 2024-05-17 18:15:35 +08:00
8f8e024cfe Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-15 17:31:37 +08:00
db9d37d370 feat(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-15 17:31:19 +08:00
1f963a84f7 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-12 18:55:29 +08:00
aba5d6d6c6 feat(custom): 新增活动订单核销
All checks were successful
continuous-integration/drone/push Build is passing
2024-04-12 18:54:54 +08:00
79f34be500 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-20 16:37:56 +08:00
e139fed2a6 feat(custom): 新增若干功能
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-20 16:35:15 +08:00
760c843060 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-09 18:18:27 +08:00
71f72ff03d feat(custom): 增加后结统计时间筛选
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-09 18:17:51 +08:00
af20de8776 Merge branch 'dev' into test
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 20:55:00 +08:00
dd49ee9cd6 ci(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 20:54:49 +08:00
3a246511e1 ci(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 19:15:47 +08:00
7d7ac808f8 ci(custom):
All checks were successful
continuous-integration/drone/push Build is passing
2024-03-08 19:06:17 +08:00
a53552943a Merge branch 'dev' into test
Some checks failed
continuous-integration/drone Build is failing
2024-03-08 18:59:17 +08:00
eb1f6ff400 ci(custom): update .drone.yml 2024-03-08 18:58:53 +08:00
2faf99c2ff ci(custom): add CICD 2024-03-08 18:58:06 +08:00
c8974937ff Merge branch 'dev' into test 2024-03-07 18:58:37 +08:00
d619dcb268 feat(custom): 增加核销人员权限 2024-03-07 18:58:15 +08:00
011284c5dc Merge branch 'dev' into test 2024-03-05 21:20:39 +08:00
893649afdd fix(custom): 去除后结订单统计多余逻辑 2024-03-05 21:20:20 +08:00
a0f1d29597 Merge branch 'dev' into test 2024-03-04 21:20:31 +08:00
8354c2ae72 feat(custom): 新增后结功能模块 2024-03-04 21:20:05 +08:00
74a4aa3ab2 Merge branch 'dev' into test 2024-01-25 22:48:31 +08:00
ab960e139f feat(custom): 新增豆子记录 2024-01-25 22:47:53 +08:00
fca2672393 Merge branch 'dev' into test 2024-01-22 22:25:25 +08:00
f7b4942ef9 fix(custom): 修复添加商品时商品分类不是必选项的bug 2024-01-22 22:24:11 +08:00
28a6b326e4 Merge branch 'dev' into test 2023-12-17 21:49:22 +08:00
590f722d00 mod(custom): 部分细节优化 2023-12-17 21:48:17 +08:00
c9b590fcb2 Merge branch 'dev' into test 2023-12-15 20:48:04 +08:00
cdeab8ea29 feat(custom): 增加商品分类序号 2023-12-15 20:47:16 +08:00
40d27d2032 Merge branch 'dev' into test 2023-12-13 13:21:05 +08:00
6b8e3fac6c feat(custom): 增加订单支付方式筛选 2023-12-13 13:19:58 +08:00