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

• 5cd88dfb08 feat(model): 为多个模型添加不记录日志属性 mkm 2025-01-04 10:34:38 +08:00
• abf1e55bc7 添加定时确认商品改价 lewis 2025-01-04 10:31:17 +08:00
• acac4d2950 refactor(admin): 关闭门店商品导入接口并优化库存日志记录 mkm 2025-01-04 10:20:35 +08:00
• f534328987 refactor(warehouse): 重构仓库相关逻辑 mkm 2025-01-04 10:00:09 +08:00
• 02b8057281 Merge pull request 'dev' (#422) from dev into main mkm 2025-01-04 09:31:57 +08:00
• 902069b4f9 门店后台添加预订单 lewis 2025-01-03 17:48:43 +08:00
• acd6f8b402 调整预订单转支付订单 lewis 2025-01-03 11:44:45 +08:00
• dfae914b6f 处理商品价格同步的错误 lewis 2025-01-02 15:10:06 +08:00
• 52561ce880 修改商品采购价格设置 lewis 2025-01-02 14:43:15 +08:00
• b21bfe7657 feat(log): 添加操作日志记录功能 mkm 2025-01-02 11:58:30 +08:00
• 746f0970da Merge branch 'main' of https://gitea.lihaink.cn/mkm/multi-store lewis 2025-01-02 11:25:31 +08:00
• 53cb5d8f06 Merge branches 'dev' and 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2025-01-01 10:47:24 +08:00
• 99730d82ad refactor(xlsx): 优化多个报表的导出功能 mkm 2025-01-01 10:47:19 +08:00
• 2666241796 添加定时更新商品价格 lewis 2024-12-31 17:41:13 +08:00
• ec78cd4953 修改商品分类编辑 lewis 2024-12-31 16:07:44 +08:00
• 50d90f7c65 Merge pull request '修改商品采购价格设置的错误' (#421) from dev into main mkm 2024-12-31 14:13:51 +08:00
• 77a1b62bb3 修改商品采购价格设置的错误 lewis 2024-12-31 14:13:35 +08:00
• 82b57689ab Merge pull request 'dev' (#420) from dev into main mkm 2024-12-31 13:48:42 +08:00
• 733adc5091 修改商品采购价格设置的错误 lewis 2024-12-31 13:35:42 +08:00
• aee0609d17 调整商品分组价格计算 lewis 2024-12-31 11:29:25 +08:00
• c2a5ee0fdc 调整商品分组价格计算 lewis 2024-12-30 17:57:27 +08:00
• 6bd842bd4c Merge pull request '修改供应商列表，添加商品价格同步' (#419) from dev into main mkm 2024-12-30 16:32:04 +08:00
• 844c085df5 修改供应商列表，添加商品价格同步 lewis 2024-12-30 16:31:28 +08:00
• 9a8b46e1fe Merge pull request 'dev' (#418) from dev into main mkm 2024-12-28 16:29:38 +08:00
• 66dbfd5908 Merge branch 'main' into dev mkm 2024-12-28 16:27:47 +08:00
• a5e9c47a36 调整活动专区商品列表 lewis 2024-12-28 16:25:55 +08:00
• 6266a4c147 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2024-12-28 16:04:02 +08:00
• 50d76b14b2 调整活动专区商品列表 lewis 2024-12-28 16:03:57 +08:00
• 1ebc282e1b Merge pull request 'dev' (#417) from dev into main mkm 2024-12-28 11:07:33 +08:00
• 35a646ca3e refactor(admin): 移除 IndexController 中的冗余参数 mkm 2024-12-28 11:06:06 +08:00
• 715f84d2f2 修改采购单价格的错误 lewis 2024-12-27 17:56:18 +08:00
• ccc774593a 修改采购单价格的错误 lewis 2024-12-27 17:36:30 +08:00
• 91a119c896 修改预订单采购商品的错误 lewis 2024-12-27 17:30:00 +08:00
• 26da169c1f 修改商品分类价格配置 lewis 2024-12-27 16:47:56 +08:00
• 456059d242 Merge pull request 'dev' (#416) from dev into main mkm 2024-12-27 11:32:35 +08:00
• 69030f1fbc 修改活动专区商品排序 lewis 2024-12-27 11:31:54 +08:00
• bebbd7083d 修改采购商品信息 lewis 2024-12-27 11:08:11 +08:00
• fcbdf65ba8 添加商品批次 batch lewis 2024-12-27 11:04:51 +08:00
• 178a4b5223 Merge pull request 'dev' (#415) from dev into main mkm 2024-12-26 18:05:52 +08:00
• b1b3396c0b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-12-26 18:05:27 +08:00
• b2d125448f feat(admin): 添加 demo2 接口 mkm 2024-12-26 18:05:22 +08:00
• 0e2b83587b 采购商品添加生产日期、保质期 lewis 2024-12-26 17:04:58 +08:00
• 5ccd1c27b2 Merge pull request 'dev' (#414) from dev into main mkm 2024-12-26 11:49:18 +08:00
• e5fbfe2993 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2024-12-26 11:42:31 +08:00
• a695d47934 调整采购单 lewis 2024-12-26 11:42:26 +08:00
• a1b759b0aa refactor(warehouse): 优化仓库产品逻辑中的订单类型判断 mkm 2024-12-26 11:27:58 +08:00
• 6f39a58b16 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev mkm 2024-12-26 10:45:20 +08:00
• 2bafdff052 feat(DemoLogic): 更新产品价格并添加酒店价格设置 mkm 2024-12-26 10:44:56 +08:00
• 0f0459de19 Merge pull request 'dev' (#413) from dev into main mkm 2024-12-25 17:57:36 +08:00
• e722c1a773 修改小程序端提交采购信息 lewis 2024-12-25 17:55:53 +08:00
• e063fcfe7f 修改分组价格设置 lewis 2024-12-25 15:18:34 +08:00
• 04b98e4b63 修改分类 lewis 2024-12-25 14:10:28 +08:00
• 1d9b9692d1 Merge pull request '修改采购单生成规则' (#412) from dev into main mkm 2024-12-25 11:39:02 +08:00
• 77a1969ceb 修改采购单生成规则 lewis 2024-12-25 11:38:11 +08:00
• d0294567b7 Merge pull request 'dev' (#411) from dev into main mkm 2024-12-24 17:33:14 +08:00
• ed01ef1b9a 修改活动专区商品列表导出 lewis 2024-12-24 17:32:49 +08:00
• f265a07cd5 修改活动专区商品列表导出 lewis 2024-12-24 16:54:00 +08:00
• 74540a66b8 Merge pull request 'dev' (#410) from dev into main mkm 2024-12-24 16:43:08 +08:00
• a316fe15cc 修改活动专区商品列表导出 lewis 2024-12-24 16:42:29 +08:00
• c6941df7cc 修改活动专区商品列表导出 lewis 2024-12-24 16:41:45 +08:00
• 3c8a8d3c76 Merge pull request 'dev' (#409) from dev into main mkm 2024-12-24 16:12:46 +08:00
• 58224a6e62 Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2024-12-24 15:18:56 +08:00
• e48a8e5d7d 修改活动专区商品列表和导出 lewis 2024-12-24 15:18:51 +08:00
• 87bdbea515 Merge pull request 'dev' (#408) from dev into main mkm 2024-12-24 10:48:41 +08:00
• 785a3a8615 fix(app): 修复购买产品优惠时的支付类型名称显示问题 mkm 2024-12-24 10:48:12 +08:00
• b2a3df87c4 refactor(purchase_product_offer): 重构采购产品报价逻辑 mkm 2024-12-24 10:47:55 +08:00
• 71d861dd78 fix(purchase): 修复采购价计算逻辑 mkm 2024-12-24 10:38:40 +08:00
• 8a64c1cefa Merge pull request 'dev' (#407) from dev into main mkm 2024-12-24 09:34:13 +08:00
• 1f82805875 fix(app): 修复支付回调和订单推送的相关问题 mkm 2024-12-24 09:27:39 +08:00
• 5727572e0d fix(queue): 优化小票打印逻辑 mkm 2024-12-24 09:07:25 +08:00
• 2be22adcb3 fix(printer): 修复小票打印商品名称错误 mkm 2024-12-23 18:12:15 +08:00
• df8f3523f6 feat(printer): 添加订单打印功能 mkm 2024-12-23 17:52:58 +08:00
• 147eefa363 Merge pull request '调整商品分类的错误' (#406) from dev into main mkm 2024-12-23 17:42:55 +08:00
• be6cf0aa3f 调整商品分类的错误 lewis 2024-12-23 17:42:48 +08:00
• b63d19bfdf Merge pull request 'dev' (#405) from dev into main mkm 2024-12-23 17:06:26 +08:00
• c66204184b Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev lewis 2024-12-23 17:04:10 +08:00
• 93dad81183 调整商品分类的错误 lewis 2024-12-23 17:03:51 +08:00
• ad57a6f9a5 调整商品分类的错误 lewis 2024-12-23 17:02:50 +08:00
• 56b14aedd2 Merge pull request 'feat(admin): 增加商品进销存价格列表显示' (#404) from dev into main mkm 2024-12-23 15:53:32 +08:00
• 127445c074 feat(admin): 增加商品进销存价格列表显示 mkm 2024-12-23 15:39:18 +08:00
• c7b7c93a4e Merge pull request 'dev' (#403) from dev into main mkm 2024-12-21 23:38:37 +08:00
• 3710728806 fix(admin): 修复后台预订单商品价格逻辑 mkm 2024-12-21 23:37:35 +08:00
• b0af0a70bb Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev DESKTOP-GMUNQ1B\Administrator 2024-12-21 17:00:01 +08:00
• 325dee0181 添加活动专区商品导出 DESKTOP-GMUNQ1B\Administrator 2024-12-21 16:59:52 +08:00
• f8345d1409 Merge pull request 'dev' (#402) from dev into main mkm 2024-12-21 11:21:21 +08:00
• 181bd0a689 refactor(admin): 仓库产品列表页面优化 mkm 2024-12-21 11:19:12 +08:00
• 68fab40a25 往期补单采购不增加库存 DESKTOP-GMUNQ1B\Administrator 2024-12-20 16:24:22 +08:00
• f917ead9c7 Merge pull request 'dev' (#401) from dev into main mkm 2024-12-20 15:10:41 +08:00
• 585f64b2f5 refactor(store): 移除系统库存管理中的入库操作限制 mkm 2024-12-20 14:55:42 +08:00
• 5e83ad2b4c 添加活动专区 DESKTOP-GMUNQ1B\Administrator 2024-12-20 14:38:51 +08:00
• b6d41470c5 Merge pull request 'feat(warehouse): 编辑仓库商品存储功能' (#400) from dev into main mkm 2024-12-20 11:47:17 +08:00
• 94b42547fc feat(warehouse): 编辑仓库商品存储功能 mkm 2024-12-20 11:46:50 +08:00
• 7590d65b49 Merge pull request 'dev' (#399) from dev into main mkm 2024-12-20 10:34:44 +08:00
• 195d71519b feat(beforehand_order): 添加用户组标题并优化订单导出功能 mkm 2024-12-20 10:28:33 +08:00
• 95262ab5af feat(order): 添加会员价格功能 mkm 2024-12-19 17:34:34 +08:00
• 14555837fe 修改预订单商品采购状态 DESKTOP-GMUNQ1B\Administrator 2024-12-19 17:29:23 +08:00
• 48f9e07787 一键入库更新采购单采购状态 DESKTOP-GMUNQ1B\Administrator 2024-12-19 16:50:28 +08:00
• f38f1e98a1 Merge branch 'updateOrder' into dev DESKTOP-GMUNQ1B\Administrator 2024-12-19 16:37:41 +08:00
• 2c6e3ccb81 调整采购单生成 updateOrder DESKTOP-GMUNQ1B\Administrator 2024-12-19 16:34:17 +08:00
• 5fb2330a6d Merge pull request 'dev' (#398) from dev into main mkm 2024-12-19 11:27:55 +08:00