Commit Graph

Select branches

Hide Pull Requests

5.X

6.X

#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

#685

#685

#686

#686

#687

#687

#688

#688

#689

#689

#69

#69

#690

#690

#691

#691

#692

#692

#693

#693

#694

#694

#695

#695

#696

#696

#697

#697

#698

#698

#699

#699

#7

#7

#70

#70

#700

#700

#701

#701

#702

#702

#703

#703

#704

#704

#705

#705

#706

#706

#707

#707

#708

#708

#709

#709

#71

#71

#710

#710

#711

#711

#712

#712

#713

#713

#714

#714

#715

#715

#716

#717

#717

#718

#718

#719

#719

#72

#72

#720

#720

#721

#721

#722

#723

#723

#724

#724

#725

#725

#726

#726

#727

#727

#728

#728

#729

#729

#73

#73

#730

#730

#731

#731

#732

#732

#733

#733

#734

#734

#735

#735

#736

#736

#737

#737

#738

#738

#739

#739

#74

#74

#740

#740

#741

#741

#742

#742

#743

#743

#744

#744

#745

#745

#746

#746

#747

#747

#748

#748

#749

#75

#75

#750

#750

#751

#751

#752

#752

#753

#753

#754

#754

#755

#755

#756

#756

#757

#757

#758

#758

#759

#759

#76

#76

#760

#760

#761

#761

#762

#762

#763

#763

#764

#764

#765

#765

#766

#766

#767

#767

#768

#768

#769

#769

#77

#77

#770

#770

#771

#771

#772

#772

#773

#773

#774

#774

#775

#775

#776

#776

#777

#777

#778

#778

#779

#779

#78

#78

#780

#780

#781

#781

#782

#782

#783

#783

#784

#784

#785

#785

#786

#786

#787

#787

#788

#788

#789

#789

#79

#79

#790

#790

#791

#791

#792

#792

#793

#793

#794

#794

#795

#795

#796

#796

#797

#797

#798

#798

#799

#799

#8

#8

#80

#80

#800

#800

#801

#801

#802

#802

#803

#803

#804

#804

#805

#805

#806

#806

#807

#807

#808

#808

#809

#809

#81

#81

#810

#810

#811

#811

#812

#812

#813

#813

#814

#814

#815

#815

#816

#816

#817

#817

#818

#818

#819

#819

#82

#82

#820

#820

#821

#821

#822

#822

#823

#823

#824

#824

#825

#826

#826

#827

#827

#828

#828

#829

#829

#83

#83

#830

#830

#831

#831

#832

#832

#833

#833

#834

#834

#835

#835

#836

#836

#837

#837

#838

#838

#839

#839

#84

#84

#840

#840

#841

#841

#842

#842

#843

#843

#844

#844

#845

#846

#846

#847

#847

#848

#848

#849

#85

#85

#850

#850

#851

#851

#852

#852

#853

#854

#854

#855

#855

#856

#856

#857

#857

#858

#858

#859

#859

#86

#86

#860

#860

#861

#861

#862

#862

#863

#863

#864

#864

#865

#865

#866

#866

#867

#867

#868

#868

#869

#869

#87

#87

#870

#870

#871

#871

#872

#872

#873

#874

#874

#875

#875

#876

#876

#877

#877

#878

#878

#879

#879

#88

#88

#880

#880

#881

#881

#882

#882

#883

#883

#884

#884

#885

#885

#886

#886

#887

#887

#89

#89

#9

#90

#90

#91

#91

#92

#92

#93

#93

#94

#94

#95

#95

#96

#96

#97

#97

#98

#99

#99

v4.8.3

v4.8.3-fast

v5.5.0

v5.5.1

v5.5.2

v5.5.3

v5.6.0

v5.6.1

v5.6.2

v6.0.0

v6.0.0-BETA

Mono Color

• 3362ce5f33 升级 MybatisPlus 3.4.2 疯狂的狮子li 2021-01-15 15:55:24 +0800
• 4bb136057d todo:报餐统计 ryoeiken 2021-01-15 15:41:01 +0800
• 71cef3f7e2 todo:开票回款 ryoeiken 2021-01-15 15:40:49 +0800
• c6f2967e70 todo:营养餐 ryoeiken 2021-01-15 15:40:33 +0800
• 52325307f4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-01-15 15:08:50 +0800
• 5b023af01c 升级依赖 提升编译速度 mactj 2021-01-15 13:55:26 +0800
• 71dc3e55d9 小程序首页 mactj 2021-01-15 12:00:20 +0800
• a8a1b53794 优化：初始化病患数据时，默认将加餐状态设置为禁用 czx 2021-01-15 10:52:32 +0800
• a722c67a96 报错引用 mactj 2021-01-14 16:51:18 +0800
• 7fa65bfe15 修改默认病人生成记录，早午晚加四餐全部启用状态 czx 2021-01-14 16:15:59 +0800
• 5e8ac3b417 修改默认病人生成记录，早午晚加四餐全部启用状态 czx 2021-01-14 16:13:16 +0800
• ca96acdfd2 增加明天报餐的预测统计接口 czx 2021-01-14 13:55:54 +0800
• cca2f5c62d update README.md RuoYi 2021-01-14 13:20:08 +0800
• c973e28951 修改开发环境数据库链连接 ryoeiken 2021-01-14 10:31:07 +0800
• ce54416e4f 升级fastjson到最新版1.2.75 RuoYi 2021-01-13 16:20:39 +0800
• bd19892aff 修复生成树表代码异常 RuoYi 2021-01-13 16:19:23 +0800
• 77b1ce9dd3 修复报餐信息表页面错误 ryoeiken 2021-01-13 16:07:31 +0800
• 647bb9d69d 已核销的订单不能进行删除 ryoeiken 2021-01-13 16:04:33 +0800
• d0191ba05d 管理页面添加人脸识别设备管理，完善人脸识别核销接口 ryoeiken 2021-01-13 15:20:34 +0800
• 5efc76dfc8 员工报餐 api：人脸核销，清空停餐信息 ryoeiken 2021-01-13 11:43:38 +0800
• 7782d98641 优化用餐时间判定类 czx 2021-01-13 09:16:00 +0800
• e323b2d970 忽略文件 mactj 2021-01-12 18:17:05 +0800
• 09ab5ee17a 忽略文件 mactj 2021-01-12 18:16:01 +0800
• 645d1f49cb 混入小程序 mactj 2021-01-12 18:04:14 +0800
• 42d3c2c828 拦截器显示ip,完善小程序注册,用户手机号不再唯一 mactj 2021-01-12 18:00:15 +0800
• 6083931b6d 人脸临时修改 czx 2021-01-12 16:32:55 +0800
• 172dd0dcd3 api：今明日报餐统计 ryoeiken 2021-01-12 15:05:38 +0800
• 4a7b400569 修复添加病人后没有生成病人配餐设置 ryoeiken 2021-01-12 10:31:16 +0800
• 98ad6c297e 病患报餐 api：报餐统计 ryoeiken 2021-01-11 17:47:14 +0800
• 3b87010f24 todo：报餐统计总数 ryoeiken 2021-01-11 16:09:30 +0800
• 06f199f3c3 修复病人配餐设置启用状态 ryoeiken 2021-01-11 15:12:17 +0800
• 86c654904a 加入统计分页操作（未完） czx 2021-01-11 14:37:45 +0800
• 95ea686ac1 增加了评论呢模块 yuanxin 2021-01-11 13:49:05 +0800
• c726fb7b60 todo：报餐统计分页 ryoeiken 2021-01-11 13:46:34 +0800
• e69d57e1a1 引入人脸识别部分代码 czx 2021-01-11 11:48:14 +0800
• 545383ed28 Merge remote-tracking branch 'origin/master' into master czx 2021-01-11 11:37:14 +0800
• fa80ce99b8 引入人脸识别部分代码 czx 2021-01-11 11:35:38 +0800
• 4415a55369 人脸信息 CRUD ryoeiken 2021-01-11 10:45:30 +0800
• a631281ba7 员工信息新增人面设备员工 id 字段 ryoeiken 2021-01-11 10:32:54 +0800
• 684eadbcc6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-01-11 09:58:41 +0800
• 2aee85ae1b 报餐统计 ryoeiken 2021-01-11 09:00:40 +0800
• 78ee4c0278 报餐统计：日统计 ryoeiken 2021-01-11 00:47:13 +0800
• 61ff8b7bcc todo：报餐统计 ryoeiken 2021-01-09 12:06:45 +0800
• 3e76d01f84 todo：开票，回款 ryoeiken 2021-01-09 12:06:23 +0800
• 835e6dfcd0 会员客户端 api：获取会员主页 URL，获取会员积分，获取会员余额，获取会员代金券数量，获取会员具体项目首页 URL ryoeiken 2021-01-09 10:00:00 +0800
• 5bc16cc9d5 增加新的会员端接口授权 czx 2021-01-09 08:41:43 +0800
• f8e634e7fc 员工报餐：修改补贴订单收款，退款接口 ryoeiken 2021-01-08 17:06:22 +0800
• 63d7660df3 临时修改 czx 2021-01-08 16:32:03 +0800
• a405b4e80e todo list Machengtianjiang 2021-01-08 13:46:26 +0800
• 14a859899c 代码生成模板支持主子表 RuoYi 2021-01-08 10:47:36 +0800
• f3cb18c836 !161 修复导入数据为负浮点数时，导入结果会丢失精度问题 Merge pull request !161 from 嘿白熊/master 若依 2021-01-08 10:46:36 +0800
• 5ea0c5b143 增加字体 Machengtianjiang 2021-01-08 09:38:18 +0800
• 7d0eb3b8c7 用户显隐列添加不同key防止被复用 RuoYi 2021-01-07 13:28:16 +0800
• 654aa6b30c 表格右侧工具栏组件支持显隐列 RuoYi 2021-01-06 17:30:39 +0800
• 345cad0956 商品和规格关联完成 Machengtianjiang 2021-01-06 11:43:41 +0800
• b7cdd10f9f 修复导入数据为负浮点数时丢失精度问题 X.B-H 2021-01-06 11:11:11 +0800
• 9bd35cb7be 升级druid到最新版本v1.2.4 RuoYi 2021-01-06 11:00:20 +0800
• 7a86c714fc 代码生成支持文件上传组件 RuoYi 2021-01-06 11:00:09 +0800
• b368745380 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-01-06 09:35:00 +0800
• edd090a098 代码生成支持文件上传组件 RuoYi 2021-01-05 20:59:14 +0800
• 3cd886785b 图片组件添加预览功能 RuoYi 2021-01-05 20:33:41 +0800
• ae5a0f9774 新增文件上传组件 RuoYi 2021-01-05 20:11:09 +0800
• 074b3c735d 设置单图上传控件 RuoYi 2021-01-05 16:17:41 +0800
• a118738d0f 单图上传组件添加移除 RuoYi 2021-01-05 16:13:22 +0800
• d1b4bfc77c 员工报餐：修改查看补贴余额，添加补贴订单收款，补贴订单退款 ryoeiken 2021-01-05 14:10:21 +0800
• e65f914663 表单的导出 Machengtianjiang 2021-01-05 11:29:25 +0800
• 9c5fc1ba2c 员工报餐：用餐流水（订单）查看,获取截止订餐参数,获取菜品清单,获取订餐优惠比例 ryoeiken 2021-01-05 10:50:58 +0800
• 56fa3912ae 修复IE11浏览器报错问题 RuoYi 2021-01-05 09:44:08 +0800
• d73994f05d Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-01-05 09:22:36 +0800
• 0de0210910 员工报餐：查看商品清单 ryoeiken 2021-01-05 09:11:59 +0800
• 7514563e6c 员工报餐：查看补贴余额，查看补贴记录 ryoeiken 2021-01-05 08:44:59 +0800
• 2116ee1822 Update copyright RuoYi 2021-01-04 17:49:52 +0800
• 57a2eb4217 操作按钮组调整为朴素按钮样式 RuoYi 2021-01-04 17:48:46 +0800
• 64e943b681 todo:开票，回款 ryoeiken 2021-01-04 17:32:07 +0800
• 150676a9ad 食品管理添加用餐类型字段 ryoeiken 2021-01-04 17:27:27 +0800
• 6bd7ea834f 食品管理添加用餐类型字段 ryoeiken 2021-01-04 17:27:03 +0800
• b562da3b80 富文本上传图片 Machengtianjiang 2021-01-04 16:42:44 +0800
• 4bec2d207f 病人配餐设置页面改造 ryoeiken 2021-01-04 15:29:48 +0800
• d04a9c5cbb 病人配餐默认不开启营养餐 ryoeiken 2021-01-04 15:05:49 +0800
• 629e81c177 基本完成开票，回款登记 CRUD ryoeiken 2021-01-04 14:50:06 +0800
• b96b7bbf41 新增，修改营养配餐时一同新增，修改病人配餐设置 ryoeiken 2021-01-04 10:10:20 +0800
• 873bf7203a Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-31 17:24:43 +0800
• 2b23508f40 狮子同步最新版本 czx 2020-12-31 17:22:12 +0800
• 57e016d0f1 Merge remote-tracking branch 'origin/master' into master czx 2020-12-31 17:17:36 +0800
• 416ed16118 病患营养配餐前端页面 ryoeiken 2020-12-31 17:12:29 +0800
• f006cb9fba 修复更新用餐时间配置页面bug czx 2020-12-31 14:55:13 +0800
• 29c6f7f24d cos配置 id配置 Machengtianjiang 2020-12-31 14:40:36 +0800
• 6cb636ca40 修改参数 ryoeiken 2020-12-31 14:14:30 +0800
• 2eff99e3c0 报餐表添加新字段 ryoeiken 2020-12-31 13:42:43 +0800
• baf88a0ea4 完善根据科室获取次日报餐信息 ryoeiken 2020-12-31 11:42:11 +0800
• 9604f9495d 修复根据科室获取次日报餐信息 ryoeiken 2020-12-31 10:13:57 +0800
• 81546a3b56 获取菜品清单 ryoeiken 2020-12-31 10:04:54 +0800
• bf62105bc7 图片上传完美了 Machengtianjiang 2020-12-31 10:00:46 +0800
• 58ea5fb983 发现bug czx 2020-12-31 09:41:26 +0800
• ec74a2d3de 修改了对象存储 Machengtianjiang 2020-12-31 09:13:13 +0800
• d3ac78138a 饭堂参数前端页面 ryoeiken 2020-12-30 17:52:10 +0800
• 595adb7ae3 送餐员报餐 APP 后端接口，todo：批量更新报餐记录，通知营养科更新营养配餐信息 ryoeiken 2020-12-30 16:36:44 +0800
• e9d368ed0c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-30 16:20:09 +0800
• f27e2de7c1 更改默认报餐部门 ryoeiken 2020-12-30 11:24:16 +0800
• 21f019264e 获取部门列表 ryoeiken 2020-12-30 11:08:58 +0800