Commit Graph

Select branches

Hide Pull Requests

5.X

dev

wzj-main

wzj-wqx

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#123

#124

#124

#125

#125

#126

#126

#127

#127

#128

#128

#129

#129

#13

#13

#130

#130

#131

#131

#132

#132

#133

#133

#134

#134

#135

#135

#136

#136

#137

#137

#138

#139

#139

#14

#14

#140

#140

#141

#141

#142

#142

#143

#143

#144

#144

#145

#145

#146

#146

#147

#147

#148

#148

#149

#149

#15

#15

#150

#150

#151

#151

#152

#152

#153

#153

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#159

#16

#16

#160

#161

#161

#162

#162

#163

#163

#164

#164

#165

#165

#166

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#173

#173

#174

#174

#175

#175

#176

#176

#177

#177

#178

#178

#179

#179

#18

#18

#180

#180

#181

#181

#182

#182

#183

#183

#184

#184

#185

#185

#186

#186

#187

#187

#188

#188

#189

#189

#19

#19

#190

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#204

#204

#205

#205

#206

#206

#207

#207

#208

#208

#209

#209

#21

#21

#210

#210

#211

#211

#212

#212

#213

#213

#214

#214

#215

#215

#216

#216

#217

#217

#218

#218

#219

#219

#22

#22

#220

#220

#221

#221

#222

#222

#223

#223

#224

#224

#225

#225

#226

#226

#227

#227

#228

#228

#229

#229

#23

#23

#230

#230

#231

#231

#232

#232

#233

#233

#234

#234

#235

#235

#236

#236

#237

#237

#238

#238

#239

#239

#24

#24

#240

#240

#241

#241

#242

#242

#243

#243

#244

#244

#245

#245

#246

#246

#247

#247

#248

#248

#249

#249

#25

#25

#250

#250

#251

#251

#252

#252

#253

#253

#254

#254

#255

#255

#256

#256

#257

#257

#258

#258

#259

#259

#26

#26

#260

#260

#261

#261

#262

#262

#263

#263

#264

#264

#265

#265

#266

#266

#267

#267

#268

#268

#269

#269

#27

#27

#270

#270

#271

#271

#272

#272

#273

#273

#274

#274

#275

#275

#276

#276

#277

#277

#278

#278

#279

#279

#28

#28

#280

#280

#281

#281

#282

#282

#283

#283

#284

#284

#285

#285

#286

#286

#287

#287

#288

#288

#289

#289

#29

#29

#290

#290

#291

#291

#292

#292

#293

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#3

#3

#30

#30

#300

#300

#301

#301

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#310

#310

#311

#311

#312

#312

#313

#313

#314

#314

#315

#315

#316

#316

#317

#317

#318

#318

#319

#319

#32

#32

#320

#320

#321

#321

#322

#322

#323

#323

#324

#324

#325

#325

#326

#326

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#331

#331

#332

#332

#333

#333

#334

#334

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#340

#340

#341

#341

#342

#342

#343

#343

#344

#344

#345

#345

#346

#346

#347

#347

#348

#348

#349

#349

#35

#35

#350

#350

#351

#351

#352

#352

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#359

#359

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#364

#364

#365

#365

#366

#366

#367

#367

#368

#368

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#374

#375

#375

#376

#377

#377

#378

#378

#379

#379

#38

#38

#380

#380

#381

#381

#382

#382

#383

#383

#384

#384

#385

#385

#386

#386

#387

#387

#388

#388

#389

#389

#39

#39

#390

#390

#391

#391

#392

#392

#393

#393

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#400

#400

#401

#401

#402

#402

#403

#403

#404

#404

#405

#405

#406

#406

#407

#407

#408

#408

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#413

#413

#414

#414

#415

#415

#416

#416

#417

#417

#418

#418

#419

#419

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#430

#430

#431

#431

#432

#432

#433

#433

#434

#434

#435

#435

#436

#436

#437

#437

#438

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#443

#443

#444

#444

#445

#445

#446

#446

#447

#447

#448

#448

#449

#449

#45

#45

#450

#450

#451

#451

#452

#452

#453

#453

#454

#454

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#466

#466

#467

#467

#468

#468

#469

#469

#47

#47

#470

#470

#471

#471

#472

#472

#473

#473

#474

#474

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#480

#481

#481

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#492

#492

#493

#493

#494

#494

#495

#495

#496

#496

#497

#497

#498

#498

#499

#499

#5

#5

#50

#50

#500

#500

#501

#501

#502

#502

#503

#503

#504

#504

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#51

#510

#510

#511

#511

#512

#512

#513

#513

#514

#514

#515

#515

#516

#516

#517

#517

#518

#518

#519

#519

#52

#52

#520

#520

#521

#521

#522

#522

#523

#523

#524

#524

#525

#525

#526

#526

#527

#527

#528

#528

#529

#529

#53

#53

#530

#530

#531

#531

#532

#532

#533

#533

#534

#534

#535

#535

#536

#536

#537

#537

#538

#538

#539

#539

#54

#54

#540

#540

#541

#541

#542

#542

#543

#543

#544

#544

#545

#545

#546

#546

#547

#547

#548

#548

#549

#549

#55

#55

#550

#550

#551

#551

#552

#552

#553

#553

#554

#554

#555

#555

#556

#556

#557

#557

#558

#558

#559

#559

#56

#56

#560

#560

#561

#561

#562

#562

#563

#563

#564

#564

#565

#565

#566

#566

#567

#567

#568

#568

#569

#569

#57

#57

#570

#570

#571

#571

#572

#572

#573

#573

#574

#574

#575

#575

#576

#576

#577

#577

#578

#578

#579

#58

#58

#580

#580

#581

#581

#582

#582

#583

#583

#584

#584

#585

#585

#586

#586

#587

#587

#588

#588

#589

#589

#59

#59

#590

#590

#591

#591

#592

#592

#593

#593

#594

#594

#595

#595

#596

#596

#597

#597

#598

#598

#599

#599

#6

#6

#60

#60

#600

#600

#601

#601

#602

#602

#603

#603

#604

#604

#605

#605

#606

#606

#607

#607

#608

#608

#609

#609

#61

#61

#610

#610

#611

#611

#612

#612

#613

#613

#614

#614

#615

#615

#616

#616

#617

#617

#618

#618

#619

#619

#62

#62

#620

#620

#621

#621

#622

#622

#623

#623

#624

#624

#625

#625

#626

#626

#627

#627

#628

#628

#629

#629

#63

#63

#630

#630

#631

#631

#632

#632

#633

#633

#634

#634

#635

#635

#636

#636

#637

#637

#638

#638

#639

#639

#64

#64

#640

#640

#641

#641

#642

#642

#643

#643

#644

#644

#645

#645

#646

#646

#647

#647

#648

#648

#649

#649

#65

#65

#650

#650

#651

#651

#652

#652

#653

#653

#654

#654

#655

#655

#656

#656

#657

#657

#658

#658

#659

#659

#66

#66

#660

#660

#661

#661

#662

#662

#663

#663

#664

#664

#665

#665

#666

#666

#667

#667

#668

#668

#669

#669

#67

#67

#670

#670

#671

#671

#672

#672

#673

#673

#674

#674

#675

#675

#676

#676

#677

#677

#678

#678

#679

#679

#68

#68

#680

#680

#681

#681

#682

#682

#683

#683

#684

#684

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#79

#8

#8

#80

#80

#81

#81

#82

#82

#83

#83

#84

#84

#85

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#99

#99

4.8.2

v4.2.0

v4.3.0

v4.3.1

v4.4.0

v4.5.0

v4.6.0

v4.7.0

v4.8.0

v4.8.1

v4.8.3

v4.8.3-fast

v5.0.0

v5.1.0

v5.1.1

v5.1.2

v5.2.0

v5.2.1

v5.2.2

v5.2.3

v5.3.0

v5.3.1

Mono Color

• 6316980a42 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-01-29 11:21:03 +08:00
• 68ab632d1e 员工订单导出 ryoeiken 2021-01-29 11:20:07 +08:00
• d05fb6b92c 更新每日自动报餐，添加上营养配餐的价格 czx 2021-01-29 10:07:54 +08:00
• a425c40b21 病患报餐统计导出，修复定时任务默认插入用餐日期 ryoeiken 2021-01-29 09:28:40 +08:00
• d80646eb51 优化数据列表显示效果 czx 2021-01-28 17:58:17 +08:00
• fbed216081 病患报餐统计，日期选择增加快捷方式 czx 2021-01-28 16:15:24 +08:00
• 63485c1f7d 新增病患报餐统计功能 czx 2021-01-28 16:05:24 +08:00
• c562ef36f9 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-01-28 14:11:31 +08:00
• b38fff6727 添加病患报餐统计页面 ryoeiken 2021-01-28 14:11:19 +08:00
• 1d1e558237 新增定时器，更新用餐状态 czx 2021-01-28 11:07:22 +08:00
• 8ba1266b6a 修改 页面生成模板 适配后端时间格式 疯狂的狮子li 2021-01-28 09:22:25 +08:00
• 95d131d80d 更新员工报餐统计接口，加入明天手工报餐记录的统计。 ryoeiken 2021-01-27 16:41:52 +08:00
• 118c02144f 集成 Feign 接口化管理 Http请求(如短信,支付,推送等) 疯狂的狮子li 2021-01-27 15:15:03 +08:00
• a4756004f8 删除过时配置 疯狂的狮子li 2021-01-27 13:10:05 +08:00
• 89534b1bdc 修改配置文件 ryoeiken 2021-01-26 17:29:00 +08:00
• b69bd3edd6 Merge remote-tracking branch 'origin/dev' into dev czx 2021-01-26 17:16:01 +08:00
• 3122699557 新增病患报餐接口 czx 2021-01-26 17:15:45 +08:00
• 56ba5948a9 修复添加/修改员工信息只显示10个科室 ryoeiken 2021-01-26 16:42:34 +08:00
• cecb256bcf 修改 #4 ZHUJB-PC\Administrator 2021-01-25 17:38:33 +08:00
• 82d980b09b 发票管理结束跟踪 ryoeiken 2021-01-25 17:37:01 +08:00
• 52bcb6669f Merge branch 'master' of https://gitee.com/tottimctj/Hope-Mall ZHUJB-PC\Administrator 2021-01-25 17:34:27 +08:00
• 1216e561b7 完善了评论功能 ZHUJB-PC\Administrator 2021-01-25 17:33:05 +08:00
• 8514ebb6f0 修复组合开票后仍能再次开票的 bug ryoeiken 2021-01-25 17:12:23 +08:00
• 0cc09c302a 发票管理前端筛选 ryoeiken 2021-01-25 16:24:16 +08:00
• 007d0adfb2 修复开票管理是否已开票不能筛选的 bug ryoeiken 2021-01-25 16:17:35 +08:00
• 0e1564998f 发票管理优化前端页面 ryoeiken 2021-01-25 15:25:54 +08:00
• 6e6933bb25 支持树表生成 增加生成树表说明 疯狂的狮子li 2021-01-25 13:35:07 +08:00
• 79d8bf1e40 发票管理回款登记，回款管理 CRUD ryoeiken 2021-01-25 11:44:54 +08:00
• 2925f28255 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-01-25 09:54:49 +08:00
• e56374cbdd 删掉直播行 mactj 2021-01-25 09:04:51 +08:00
• 2903de1561 升级element-ui到最新版本2.15.0 RuoYi 2021-01-24 12:06:19 +08:00
• d1e5f465ee 头部动态根据手机调整 mactj 2021-01-22 19:47:58 +08:00
• e25001b942 样式 mactj 2021-01-22 19:14:24 +08:00
• 44d8a0c9c1 新商户证书 mactj 2021-01-22 18:55:34 +08:00
• d92f8cd997 完善发票管理前端，修复不能组合开票 bug ryoeiken 2021-01-22 17:53:43 +08:00
• 159132ee7e todo:开票金额正则表达式 开票时选择跟踪添加回款记录 ryoeiken 2021-01-22 17:44:14 +08:00
• b757912963 完善开票管理 ryoeiken 2021-01-22 17:18:50 +08:00
• 711856a329 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-01-22 17:02:11 +08:00
• 0434262959 完成预开票管理，完善开票管理前端页面 ryoeiken 2021-01-22 17:02:02 +08:00
• 25f19576a3 修正部署 mactj 2021-01-22 15:11:13 +08:00
• 19cb76bcb4 微调整 mactj 2021-01-22 13:28:21 +08:00
• 0e7d0de1ba 基本完成 mactj 2021-01-22 13:25:06 +08:00
• a016cee5c9 更新人脸设备日志提示 czx 2021-01-22 11:49:54 +08:00
• 9f11a12223 增加病患报餐按日期统计用餐数据接口 czx 2021-01-22 11:37:33 +08:00
• 32c8d566a3 Merge remote-tracking branch 'origin/dev' into dev czx 2021-01-22 11:30:43 +08:00
• e56d4e2423 增加病患报餐按日期统计用餐数据接口 czx 2021-01-22 11:29:52 +08:00
• ee16073f02 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-01-22 11:14:50 +08:00
• b5c134c960 开票管理，单条结算单开票 ryoeiken 2021-01-22 11:14:40 +08:00
• be8f6b7576 增加了退款流程 mactj 2021-01-22 10:54:01 +08:00
• 1de3f40e97 Merge remote-tracking branch 'origin/dev' into dev czx 2021-01-22 10:51:42 +08:00
• bef478693e 增加病患报餐按日期统计用餐数据接口 czx 2021-01-22 10:49:57 +08:00
• 803102f206 新增发票表，结算表字段 ryoeiken 2021-01-22 09:47:52 +08:00
• de61b4bb35 优化窗口收费查看所有未结算显示 ryoeiken 2021-01-22 09:24:19 +08:00
• 974f1fb229 窗口收费查看所有未结算 ryoeiken 2021-01-22 09:01:47 +08:00
• 1c4c13a83a 收费详情 ryoeiken 2021-01-22 00:36:16 +08:00
• 6a1931ae80 收货地址 mactj 2021-01-21 19:06:58 +08:00
• f5f13295bb 上线前最终调整 mactj 2021-01-21 19:04:31 +08:00
• fd6a2425c5 todo:收费-开票 ryoeiken 2021-01-21 17:28:02 +08:00
• 805dcebb81 修正 mactj 2021-01-21 16:14:44 +08:00
• 4a1a09e932 窗口收费-收费 ryoeiken 2021-01-21 15:32:06 +08:00
• db6d973592 一些修改 mactj 2021-01-21 11:29:21 +08:00
• 3f74f12301 修正订单 mactj 2021-01-21 10:10:44 +08:00
• bd3d3e4e0f Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-01-21 09:54:46 +08:00
• aa57a01ffa 营养餐统计 ryoeiken 2021-01-21 09:54:33 +08:00
• 0296a57895 用户地址信息入库 mactj 2021-01-21 09:32:25 +08:00
• b5e8fa2b98 统一校验配置类名称 疯狂的狮子li 2021-01-21 09:31:37 +08:00
• 1b8572d75d 暂且这样 mactj 2021-01-20 19:10:04 +08:00
• 97db9ec003 小程序访问首页活动资讯 mactj 2021-01-20 19:08:32 +08:00
• 720185aef0 bug修正 mactj 2021-01-20 18:08:35 +08:00
• 017632c1a6 Merge remote-tracking branch 'origin/master' kino 2021-01-20 17:53:58 +08:00
• ce3627ce11 活动管理 kino 2021-01-20 17:51:47 +08:00
• 8af6287c39 增加一个根据部门id查询商户信息的接口 mactj 2021-01-20 17:32:20 +08:00
• b38b66a217 更新 mactj 2021-01-20 17:25:41 +08:00
• a423661c5e 修正样式 mactj 2021-01-20 16:05:22 +08:00
• 25ada6fdb9 部署放开编译 mactj 2021-01-20 15:31:14 +08:00
• e19b458211 复数图片上传bug mactj 2021-01-20 15:28:25 +08:00
• 2f84db9e31 部署 kino 2021-01-20 14:53:41 +08:00
• 03a246aed8 修复自动生成病患报餐数据sql语句错误。 czx 2021-01-20 14:32:39 +08:00
• 21bec38537 上传图片 kino 2021-01-20 14:21:27 +08:00
• dff06a9106 预付费前端更新 czx 2021-01-20 13:45:16 +08:00
• c80e33f87d 过滤商品列表，小程序用户可看到全部商品 mactj 2021-01-20 11:51:07 +08:00
• 9515b4e754 更新预付费数据列，默认显示已付费的数据，查询切换可以查看未付费的病患。 czx 2021-01-20 11:44:54 +08:00
• cca158a697 定时任务完善自动生成病患报餐数据时，增加营养配餐相关信息 czx 2021-01-20 11:33:08 +08:00
• 9b8824842d 修正 mactj 2021-01-20 11:32:44 +08:00
• f8fb64ec5d 更新接口：返回病患加菜加饭的价格信息； czx 2021-01-20 10:42:19 +08:00
• 2e09cd299b 一些修改 mactj 2021-01-20 10:39:13 +08:00
• b16ab1b607 更新接口：返回加菜加饭的价格信息； czx 2021-01-20 10:16:13 +08:00
• 32e84c538d 更新定时任务自动生成次日病患报餐数据，增加是否配置了营养配餐标志“open_flag" czx 2021-01-20 09:30:15 +08:00
• 51d6220271 装修样式 mactj 2021-01-20 09:00:22 +08:00
• c1b9a4adaa 修正报餐统计分页前端功能 czx 2021-01-19 18:33:53 +08:00
• 5b1eb6d89d 前端对应数据库病患报餐增加是否开通营养配餐标志 czx 2021-01-19 17:52:15 +08:00
• d0f5c425b2 病患默认配餐配置表，报餐表添加营养配餐开通标志字段 ryoeiken 2021-01-19 17:06:46 +08:00
• fdb2b76691 细节 mactj 2021-01-19 16:28:42 +08:00
• 15b7221dc0 从远程获取头像，用户信息等 mactj 2021-01-19 15:46:14 +08:00
• 17451b235b 回调更新订单 kino 2021-01-19 15:16:20 +08:00
• ce0886afc2 Merge branch 'master' of https://gitee.com/tottimctj/RuoYi-Vue-Plus mactj 2021-01-19 15:06:37 +08:00
• d59efdfd6b 支付回调bug mactj 2021-01-19 15:06:27 +08:00
• 5b1913482e 商户管理 kino 2021-01-19 15:05:16 +08:00
• e940708d52 营养配餐暂停，恢复，复制，粘贴 ryoeiken 2021-01-19 14:33:04 +08:00
• fecca933bb 购物车 订单完成 mactj 2021-01-19 14:02:55 +08:00