Commit Graph

Select branches

Hide Pull Requests

aa

batch

bb

dev

dev1

dev3

dev_one

main

mkm-patch-1

product

refund

rose

updateOrder

update_warehouse_product

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

1.0.0

1.0.1

1.0.2

1.0.3

1.0.4

1.0.5

1.0.6

1.0.7

1.0.8

1.0.9

1.1.1

1.1.2

1.1.3

1.1.4

1.10.0

Mono Color

• 5b37749696 Merge pull request '修改预订单高级会员导出' (#6) from dev into main main lewis 2025-04-03 16:52:01 +08:00
• 8aa2740b50 修改预订单高级会员导出 dev lewis 2025-04-03 16:51:06 +08:00
• 8deb9a32bb Merge pull request '修改预订单高级会员导出' (#5) from dev into main lewis 2025-04-03 14:59:05 +08:00
• 2439429e4c 修改预订单高级会员导出 lewis 2025-04-03 14:58:12 +08:00
• d3c4bf923f Merge pull request '修改预订单高级会员导出' (#4) from dev into main mkm 2025-04-03 11:40:30 +08:00
• b55503650c 修改预订单高级会员导出 lewis 2025-04-03 11:40:07 +08:00
• ef846fe23d Merge pull request 'dev' (#3) from dev into main mkm 2025-04-03 11:32:03 +08:00
• 94676eb4ea Merge branch 'main' into dev mkm 2025-04-03 11:30:22 +08:00
• 7ea7dde782 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-04-03 11:29:02 +08:00
• 407553baaf 修改预订单高级会员导出 lewis 2025-04-03 11:28:58 +08:00
• 98181dfbf9 Merge pull request '更新 app/api/lists/order/CartList.php' (#2) from dev into main mkm 2025-04-02 16:12:18 +08:00
• ba6d76de7e 更新 app/api/lists/order/CartList.php mkm 2025-04-02 16:12:02 +08:00
• d02691ccd1 更新 app/api/lists/order/CartList.php mkm-patch-1 mkm 2025-04-02 16:11:10 +08:00
• bb5f16e971 Merge pull request 'dev' (#1) from dev into main mkm 2025-04-02 16:06:56 +08:00
• cf55572a9b 更新 app/api/lists/product/ProductLists.php mkm 2025-04-02 16:06:09 +08:00
• 5f543566cb 调整商品调拨单 lewis 2025-03-26 17:44:29 +08:00
• 5d74bf2f41 修改报损出库 lewis 2025-03-26 14:00:16 +08:00
• 38d5451d9f Merge pull request '数据变更列表添加操作时间' (#560) from dev into main mkm 2025-03-26 10:49:54 +08:00
• 9e51c0963b 数据变更列表添加操作时间 lewis 2025-03-26 10:39:07 +08:00
• 5a00d7a858 Merge pull request '修改预订单出库' (#559) from dev into main mkm 2025-03-26 10:19:06 +08:00
• 4585c57609 修改预订单出库 lewis 2025-03-25 14:46:58 +08:00
• 53faf6751c Merge pull request '采购资金添加详情' (#558) from dev into main mkm 2025-03-24 14:30:16 +08:00
• 6e8b34f301 采购资金添加详情 lewis 2025-03-24 14:16:23 +08:00
• d06d71b167 Merge pull request '添加复制到仓库' (#557) from dev into main mkm 2025-03-23 09:24:41 +08:00
• 0fc761e915 添加复制到仓库 lewis 2025-03-22 11:45:20 +08:00
• 5bc0836fea Merge pull request 'dev' (#556) from dev into main mkm 2025-03-21 17:45:03 +08:00
• fcef927257 调试财务溯源 lewis 2025-03-21 17:36:00 +08:00
• b4e8f188ab 调试财务溯源 lewis 2025-03-21 17:15:38 +08:00
• 0863b55846 Merge pull request 'dev' (#555) from dev into main mkm 2025-03-21 09:17:28 +08:00
• 0ddfd9c483 调试财务溯源 lewis 2025-03-20 15:58:38 +08:00
• e2b47ab17b 调试财务溯源 lewis 2025-03-20 15:29:55 +08:00
• 7f843c5698 调试财务溯源 lewis 2025-03-20 15:20:44 +08:00
• 09a6c25259 调试财务溯源 lewis 2025-03-20 15:04:32 +08:00
• ccfd1f3556 调试财务溯源 lewis 2025-03-20 14:16:00 +08:00
• a20a7eb8b4 Merge pull request 'dev' (#554) from dev into main mkm 2025-03-18 16:15:08 +08:00
• 0eb1586076 修改预订单列表查询 lewis 2025-03-18 16:07:45 +08:00
• 98815747f5 修改商品改价列表 lewis 2025-03-18 15:20:56 +08:00
• 4d22eecf2d Merge pull request '修改商品溯源导出' (#553) from dev into main mkm 2025-03-18 09:40:19 +08:00
• 4be97abe72 Merge branch 'main' into dev luofei 2025-03-18 09:38:35 +08:00
• 6751be1f23 修改商品溯源导出 lewis 2025-03-18 09:37:05 +08:00
• 0d30d497cc Merge pull request '修改商品溯源导出' (#552) from dev into main mkm 2025-03-17 18:48:10 +08:00
• 7fc4d87249 修改商品溯源导出 lewis 2025-03-17 18:47:43 +08:00
• 2c5c541fe8 Merge pull request '添加商品溯源导出' (#551) from dev into main mkm 2025-03-17 18:36:36 +08:00
• 43b34ea55b 添加商品溯源导出 lewis 2025-03-17 18:35:48 +08:00
• 2d615a43e6 Merge pull request '修改出入库补单' (#550) from dev into main mkm 2025-03-17 17:34:41 +08:00
• 712409b41b 修改出入库补单 lewis 2025-03-17 17:31:15 +08:00
• 67a019608a Merge pull request '添加出入库补单' (#549) from dev into main mkm 2025-03-17 17:21:52 +08:00
• 4d89794a05 添加出入库补单 lewis 2025-03-17 16:40:34 +08:00
• 2accc5e41d Merge pull request 'dev' (#548) from dev into main mkm 2025-03-17 15:34:14 +08:00
• 6475df1d71 修改图片字段的错误 lewis 2025-03-17 15:33:03 +08:00
• a9ae0ede08 修改出库单商品详情 lewis 2025-03-17 15:04:40 +08:00
• cfcb1c181c Merge pull request 'dev' (#547) from dev into main mkm 2025-03-17 14:42:28 +08:00
• 60ae388d9f Merge branch 'update_warehouse_product' into dev lewis 2025-03-17 14:36:13 +08:00
• c3acd04bf8 商品溯源详情添加跳转 lewis 2025-03-17 14:36:02 +08:00
• 8bfe65cea9 修改商品改价 update_warehouse_product lewis 2025-03-17 11:00:45 +08:00
• 6375194854 Merge pull request 'update_warehouse_product' (#546) from update_warehouse_product into main mkm 2025-03-15 11:26:09 +08:00
• a8acf3ae67 修改预订单导出 lewis 2025-03-15 11:18:26 +08:00
• f27d25311a Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store lewis 2025-03-15 10:47:10 +08:00
• a49919882a 调整商品溯源 lewis 2025-03-14 18:16:27 +08:00
• c9684b2f8b 调整商品溯源 lewis 2025-03-14 17:37:36 +08:00
• 4a8d90d1a6 调整商品溯源 lewis 2025-03-14 17:18:17 +08:00
• b2e51cbf5f refactor(app): 调整商品价格显示逻辑 mkm 2025-03-14 16:56:05 +08:00
• 092e5e1785 fix(admin): 修复预订单购物车信息逻辑 mkm 2025-03-14 14:46:18 +08:00
• 02c96c75d7 feat: 价格趋势数据按时间顺序排序 mkm 2025-03-14 11:59:23 +08:00
• d367e0e49f refactor(admin): 优化商品价格查询和订单处理逻辑 mkm 2025-03-14 11:50:36 +08:00
• 0ad56182cf 修改商品出入库溯源 lewis 2025-03-13 17:49:03 +08:00
• ad25d6c599 调整商品溯源 lewis 2025-03-12 17:54:08 +08:00
• 8c4128ccd4 calc(product-source-link): 计算商品溯源列表中的总数和仓库数 mkm 2025-03-12 14:34:21 +08:00
• 47de656777 refactor(api): 更新 IndexController 中的数据处理逻辑 mkm 2025-03-12 11:21:45 +08:00
• a49586f4d9 Merge pull request 'fix(inventory_transfer): 修复库存转移列表中数量字段的显示' (#545) from dev into main mkm 2025-03-11 11:43:38 +08:00
• d92a6bfea5 fix(inventory_transfer): 修复库存转移列表中数量字段的显示 mkm 2025-03-11 11:16:38 +08:00
• d21f8f9153 Merge pull request 'feat(inventory_transfer): 添加订单号搜索功能并更新列表显示' (#544) from dev into main mkm 2025-03-11 11:03:57 +08:00
• 9a3b4646fe feat(inventory_transfer): 添加订单号搜索功能并更新列表显示 mkm 2025-03-11 10:58:19 +08:00
• 150b5fd895 Merge pull request 'dev' (#543) from dev into main mkm 2025-03-09 13:31:19 +08:00
• f8d11cc787 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-03-09 13:29:12 +08:00
• 13c5778c41 refactor(admin): 修改商品列表字段名称 mkm 2025-03-09 13:29:08 +08:00
• ba46f11f0b Merge pull request 'dev' (#542) from dev into main mkm 2025-03-06 17:02:03 +08:00
• 703356cc3c 修改商品库存查询的错误 lewis 2025-03-06 17:01:18 +08:00
• a00173be2e 修改预订单录入的错误 lewis 2025-03-06 16:16:06 +08:00
• d01debfc77 Merge pull request 'dev' (#541) from dev into main mkm 2025-03-06 11:23:19 +08:00
• 8ef42fc024 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-03-06 11:20:09 +08:00
• 22ba0f70db 修改预订单录入的错误 lewis 2025-03-06 11:20:04 +08:00
• c5733df38f Merge pull request 'refactor(admin): 重构前置订单中的会员价格获取逻辑' (#540) from dev into main mkm 2025-03-05 17:45:31 +08:00
• 3060fa4323 refactor(admin): 重构前置订单中的会员价格获取逻辑 mkm 2025-03-05 17:44:21 +08:00
• f07e3ab207 Merge pull request '修改门店商品列表导出字段' (#539) from dev into main mkm 2025-03-04 15:05:21 +08:00
• a3e1660e45 修改门店商品列表导出字段 lewis 2025-03-04 11:43:41 +08:00
• 6ae8cc3011 Merge pull request 'dev' (#538) from dev into main mkm 2025-03-03 15:14:49 +08:00
• c9e57c85b8 fix(store_product): 修复商品恢复功能 mkm 2025-03-03 15:12:49 +08:00
• 8a8c7116fa 修改支付队列 lewis 2025-03-03 11:07:07 +08:00
• 73dcd5d130 Merge pull request 'feat(warehouse): 仓库列表增加订单类型字段' (#537) from dev into main mkm 2025-03-01 10:45:07 +08:00
• 65f65afc50 feat(warehouse): 仓库列表增加订单类型字段 mkm 2025-03-01 10:44:26 +08:00
• 7b153c2a0f Merge pull request '修改用户会员价' (#536) from dev into main mkm 2025-02-25 12:06:12 +08:00
• c37634af7d 修改用户会员价 lewis 2025-02-25 12:05:57 +08:00
• 090ef53143 Merge pull request '修改用户会员价' (#535) from dev into main mkm 2025-02-25 11:59:47 +08:00
• 2915606dff 修改用户会员价 lewis 2025-02-25 11:59:36 +08:00
• 24ba8d7d6d Merge pull request 'dev' (#534) from dev into main mkm 2025-02-25 11:56:08 +08:00
• e829ca6f4e 修改用户会员价 lewis 2025-02-25 11:55:10 +08:00
• 88fb8b504e 修改用户会员价 lewis 2025-02-25 11:50:56 +08:00
• b95d0f00f8 Merge pull request '已删除商品支持恢复' (#533) from dev into main mkm 2025-02-24 15:51:58 +08:00
• e2bcde3167 已删除商品支持恢复 lewis 2025-02-24 15:51:35 +08:00