Commit Graph

Select branches

Hide Pull Requests

aa

batch

bb

dev

dev1

dev3

dev_one

main

mkm-patch-1

mkm-patch-2

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

• 67e4f41d7d refactor(api): 调整商品数据导入逻辑 dev mkm 2025-05-06 17:32:29 +08:00
• bb93f8f238 Merge pull request 'dev' (#31) from dev into main main mkm 2025-04-28 11:56:35 +08:00
• f3b547b835 修改仓库商品查询的错误 lewis 2025-04-28 11:55:17 +08:00
• bcbcd626c3 1 mkm 2025-04-24 18:36:25 +08:00
• 7e11bf3bb2 1 mkm 2025-04-24 18:36:14 +08:00
• 03af4a589a Merge pull request 'feat(admin): 为商品列表添加图片字段' (#30) from dev into main mkm 2025-04-24 15:58:33 +08:00
• 13a575ca0c feat(admin): 为商品列表添加图片字段 mkm 2025-04-24 15:57:54 +08:00
• fb3b626970 Merge pull request '添加导入商品采购价' (#29) from dev into main mkm 2025-04-23 15:22:57 +08:00
• 959978f746 添加导入商品采购价 lewis 2025-04-23 15:22:27 +08:00
• fbba725ce7 Merge pull request '同步商品价格比例' (#28) from dev into main mkm 2025-04-18 18:00:39 +08:00
• 11687aa3d4 同步商品价格比例 lewis 2025-04-18 18:00:11 +08:00
• a08d11f69c Merge pull request '同步商品价格比例' (#27) from dev into main mkm 2025-04-18 17:50:28 +08:00
• 49d534a48d 同步商品价格比例 lewis 2025-04-18 17:49:43 +08:00
• 0a046509dd Merge pull request '添加商品价格更新时间' (#26) from dev into main mkm 2025-04-18 17:30:15 +08:00
• 970a7f07c5 添加商品价格更新时间 lewis 2025-04-18 17:22:06 +08:00
• 848dbf2c80 Merge pull request 'dev' (#25) from dev into main mkm 2025-04-18 16:33:03 +08:00
• 463da3cef1 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2025-04-18 16:32:27 +08:00
• 5e35acdc39 修改商品零售价格的错误 lewis 2025-04-18 16:31:14 +08:00
• 58b70c53f8 Merge pull request 'refactor(xlsx): 调整订单供货出库表格的列标题和数据填充逻辑' (#24) from dev into main mkm 2025-04-18 15:20:36 +08:00
• b9e34a94d9 refactor(xlsx): 调整订单供货出库表格的列标题和数据填充逻辑 mkm 2025-04-18 15:19:00 +08:00
• 6d67d00c63 Merge pull request 'feat(admin): 仓库产品列表增加分类搜索功能' (#23) from dev into main mkm 2025-04-18 13:48:42 +08:00
• 3976af97f1 feat(admin): 仓库产品列表增加分类搜索功能 mkm 2025-04-18 13:47:42 +08:00
• a89f7fbe28 Merge pull request '调整了查询条件，增加了对class_all参数的处理。' (#22) from dev into main mkm 2025-04-18 12:07:45 +08:00
• bb039fcf5e 调整了查询条件，增加了对class_all参数的处理。 lewis 2025-04-18 12:06:16 +08:00
• b461c79b53 Merge pull request '修改商品列表搜索' (#21) from dev into main mkm 2025-04-17 09:57:21 +08:00
• 197a31668e 修改商品列表搜索 lewis 2025-04-17 09:57:07 +08:00
• b3dee9c166 Merge pull request '修改商品列表搜索' (#20) from dev into main mkm 2025-04-17 09:44:42 +08:00
• 6dcd228e3c 修改商品列表搜索 lewis 2025-04-17 09:44:17 +08:00
• fb4d528070 Merge pull request '更新 app/admin/logic/store_product/StoreProductLogic.php' (#19) from mkm-patch-2 into main mkm 2025-04-16 18:20:31 +08:00
• 90927b1c8e 更新 app/admin/logic/store_product/StoreProductLogic.php mkm-patch-2 mkm 2025-04-16 18:20:21 +08:00
• 363c7d604a Merge pull request 'dev' (#18) from dev into main mkm 2025-04-16 17:18:47 +08:00
• eb24c561ad 修改商品列表搜索 lewis 2025-04-16 17:17:55 +08:00
• 4fc5b2d8dd 修改商品列表搜索 lewis 2025-04-16 17:14:58 +08:00
• 42750fcab9 Merge pull request '修改商品列表搜索' (#17) from dev into main mkm 2025-04-16 17:00:51 +08:00
• 022a25c6a6 修改商品列表搜索 lewis 2025-04-16 17:00:29 +08:00
• 4f7c8ffa85 Merge pull request '修改商品列表搜索' (#16) from dev into main mkm 2025-04-16 16:44:58 +08:00
• 881164ebbd 修改商品列表搜索 lewis 2025-04-16 16:43:41 +08:00
• 0d6c8f8057 Merge pull request '调试导入赠品' (#15) from dev into main mkm 2025-04-16 10:29:23 +08:00
• fae49b796f 调试导入赠品 lewis 2025-04-16 10:24:40 +08:00
• 7e8a5d5420 Merge pull request 'dev' (#14) from dev into main mkm 2025-04-14 17:31:58 +08:00
• 3d47bb1b5d 修改预订单商品退库 lewis 2025-04-14 17:30:52 +08:00
• c19efa176a 商品图片管理1 sjeam 2025-04-14 16:02:44 +08:00
• c19ef6080a 商品图片管理 sjeam 2025-04-14 15:33:52 +08:00
• e220e660f8 Merge pull request 'dev' (#13) from dev into main mkm 2025-04-14 14:45:22 +08:00
• daf4b858ce 修改采购价格录入限制 lewis 2025-04-14 14:44:25 +08:00
• e6e0eaadab 调试图片上传和识别 lewis 2025-04-14 09:40:54 +08:00
• a4eb84500a Merge pull request 'fix(product): 修复商品价格保存逻辑' (#12) from dev into main mkm 2025-04-12 15:57:00 +08:00
• f9d969c85c fix(product): 修复商品价格保存逻辑 mkm 2025-04-12 15:56:30 +08:00
• 0ae06f9bfb Merge pull request '商品列表添加改价' (#11) from dev into main mkm 2025-04-12 11:43:30 +08:00
• 41264fd9a0 商品列表添加改价 lewis 2025-04-12 11:24:54 +08:00
• 40ede21710 Merge pull request '修改往期补单入库' (#10) from dev into main mkm 2025-04-11 10:24:37 +08:00
• ed4d7bb3ae 修改往期补单入库 lewis 2025-04-11 10:02:50 +08:00
• f7379b663a Merge pull request 'dev' (#9) from dev into main mkm 2025-04-10 14:36:21 +08:00
• d13c5c16b0 修改小程序端订单详情 lewis 2025-04-10 14:24:27 +08:00
• 776ee0bfbc Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into HEAD sjeam 2025-04-09 12:28:14 +08:00
• 1182ee6279 调拨单详情备注 sjeam 2025-04-09 12:21:35 +08:00
• dcaca31635 add tencent sdk mkm 2025-04-08 15:33:59 +08:00
• 8d085e688e 调拨订单导出和插入修改1 sjeam 2025-04-08 14:44:26 +08:00
• 5e378a3372 调拨订单导出和插入修改1 sjeam 2025-04-08 14:40:56 +08:00
• 83fe8c4539 调拨订单导出和插入修改 sjeam 2025-04-08 12:40:18 +08:00
• 95514a0da6 调拨订单导出和插入修改 sjeam 2025-04-08 12:32:33 +08:00
• d05a8c842d 调拨订单导出和插入修改 sjeam 2025-04-08 12:23:52 +08:00
• dd681470d8 调拨订单导出和插入arr sjeam 2025-04-08 11:39:42 +08:00
• be9781f170 调拨订单导出和插入 sjeam 2025-04-08 11:23:09 +08:00
• 6e291277d0 调拨订单导出和插入 sjeam 2025-04-08 11:18:54 +08:00
• c26790ebbe excel导入铺货。修改接口 sjeam 2025-04-07 14:01:01 +08:00
• 08fa715e73 excel导入铺货。修改接口 sjeam 2025-04-07 13:37:23 +08:00
• 4875159679 excel导入铺货。修改接口 sjeam 2025-04-07 12:10:28 +08:00
• e3dc0985bd excel导入铺货 sjeam 2025-04-07 10:46:37 +08:00
• 3a1f256fe9 Merge pull request '修改商品出库的错误' (#8) from dev into main lewis 2025-04-06 10:57:12 +08:00
• d1a4e5acdf 修改商品出库的错误 lewis 2025-04-06 10:56:09 +08:00
• d71b3ddefa Merge pull request '修改采购价格录入的错误' (#7) from dev into main lewis 2025-04-06 10:35:44 +08:00
• 850773a2fd 修改采购价格录入的错误 lewis 2025-04-06 10:33:06 +08:00
• 5b37749696 Merge pull request '修改预订单高级会员导出' (#6) from dev into main lewis 2025-04-03 16:52:01 +08:00
• 8aa2740b50 修改预订单高级会员导出 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