Commit Graph

Select branches

Hide Pull Requests

5.X

6.X

dev

#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

• 969b6aef37 添加注释 ryoeiken 2020-12-30 11:05:00 +0800
• f9a5efd406 护工获取默认部门信息 ryoeiken 2020-12-30 10:57:17 +0800
• 339ea49928 护工添加手机号码及密码 ryoeiken 2020-12-30 10:26:25 +0800
• 48c922a3a9 后端接口：获取指定病患明天的订餐记录,获取指定科室明天的报餐记录 ryoeiken 2020-12-30 09:26:41 +0800
• d5195dfe9e 修复一对多bug 28353131@qq.com 2020-12-29 22:08:22 +0800
• 1a6837f49e 一对多完善 czx 2020-12-29 18:41:11 +0800
• e73d581adf 一对多初步 ryoeiken 2020-12-29 17:49:43 +0800
• 5d4451ec27 一对多初步 ryoeiken 2020-12-29 17:49:33 +0800
• 6c80b39059 一对多初步 ryoeiken 2020-12-29 17:48:43 +0800
• 9e3f618ce2 补贴详情 ryoeiken 2020-12-29 17:46:45 +0800
• 647af5b485 菜单组件修改允许空字符串 RuoYi 2020-12-29 17:27:48 +0800
• 3f33219134 !156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 Merge pull request !156 from li_oxen/N/A 若依 2020-12-29 17:14:31 +0800
• af23213b9c 修复窗口收费前端 bug ryoeiken 2020-12-29 16:26:59 +0800
• 418c8b6657 窗口收费 ryoeiken 2020-12-29 16:18:20 +0800
• a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 li_oxen 2020-12-29 13:51:15 +0800
• 63992ac906 代码生成数据库文本类型生成表单文本域 RuoYi 2020-12-29 11:14:48 +0800
• b8f6731584 增加 demo模块 方便参考扩展 疯狂的狮子li 2020-12-29 10:17:44 +0800
• a5bdb5072a 员工订餐统计接口，增加部门统计 28353131@qq.com 2020-12-28 23:24:26 +0800
• 046aba1a2f Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-28 16:49:18 +0800
• af71ca6da4 todo：收费 ryoeiken 2020-12-28 16:47:51 +0800
• 241de49166 增加一些商品管理内容 Machengtianjiang 2020-12-28 16:34:06 +0800
• 43350ad40b bug：订餐配置信息 czx 2020-12-28 14:17:04 +0800
• 93e7f53cf8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-28 10:40:13 +0800
• 08864e17b9 优化员工报餐，过来周六日 czx 2020-12-28 10:32:24 +0800
• 0187344798 Excel注解支持Image图片导出 RuoYi 2020-12-27 10:04:45 +0800
• f257ee2f6c 临时修改 czx 2020-12-25 17:59:09 +0800
• 0704a2a51c 修复 日常收费 bug ryoeiken 2020-12-25 14:34:09 +0800
• c24b912b50 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-25 09:59:24 +0800
• a9c6ba12e6 代码生成日期控件区分范围 RuoYi 2020-12-25 09:35:20 +0800
• bb0adb833a 完善订餐逻辑，先删除停餐记录 28353131@qq.com 2020-12-24 22:38:55 +0800
• ba068eae65 修正侧边栏静态路由丢失问题 RuoYi 2020-12-24 19:32:18 +0800
• b3e000c255 部署配置 Machengtianjiang 2020-12-24 17:26:13 +0800
• 49c6164445 端口配置 Machengtianjiang 2020-12-24 17:25:16 +0800
• ff2e63e3b7 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-24 17:07:44 +0800
• f84ce6e13f 病人同步 ryoeiken 2020-12-24 17:07:37 +0800
• ae58cafd81 小程序代码迁移完毕 Machengtianjiang 2020-12-24 16:43:08 +0800
• e01edd535b 增加统计单日接口 czx 2020-12-24 14:10:16 +0800
• 69785a0388 返回有效记录接口bug czx 2020-12-24 12:29:19 +0800
• 32cbe06ec6 优化返回有效记录接口，只返回今天以后的记录 czx 2020-12-24 11:17:28 +0800
• 357eb123c9 返回菜单接口bug czx 2020-12-24 10:06:03 +0800
• 476df3117b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-24 10:04:54 +0800
• 5f825db580 增加初始化员工配置记录接口 czx 2020-12-24 09:17:17 +0800
• ff11bbb16f 优化获取有效停餐记录接口，只返回今天以后的记录 28353131@qq.com 2020-12-23 23:39:34 +0800
• 4064be7c50 优化菜谱接口，获取某一天的菜谱 28353131@qq.com 2020-12-23 23:29:53 +0800
• d903c4ebe5 增加今日菜单功能 28353131@qq.com 2020-12-23 23:27:13 +0800
• 14186cc4af 完成 日常收费 - 收费 功能 ryoeiken 2020-12-23 11:13:12 +0800
• 422bd341ef 修复 日常收费 - 收费 清空选择日期时错误 ryoeiken 2020-12-23 08:17:36 +0800
• 21416475a2 收费页面弹出层 ryoeiken 2020-12-22 18:00:07 +0800
• 1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参 Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU 若依 2020-12-22 16:19:51 +0800
• f0ac254e43 修复 日常收费 - 收费 弹出层错误 ryoeiken 2020-12-22 11:22:02 +0800
• ef75dedb13 补贴流水列表回显，修复搜索框显示选择字典 ryoeiken 2020-12-22 09:24:11 +0800
• f29a047f54 修复员工，护工管理页面错误 ryoeiken 2020-12-22 08:44:18 +0800
• 29b33f393d Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-22 08:40:23 +0800
• cd24108d93 修改补贴发放提示 ryoeiken 2020-12-22 08:40:16 +0800
• 3c4b01ab83 权限工具类增加admin判断 DokiYoloo 2020-12-21 19:43:57 +0800
• bb45ccb720 Merge remote-tracking branch 'origin/master' into master czx 2020-12-21 17:54:46 +0800
• 16afb20621 修改员工登出功能 czx 2020-12-21 17:54:11 +0800
• f1040fcf40 修复错误 ryoeiken 2020-12-21 17:43:03 +0800
• 85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录，显示在职员工， ryoeiken 2020-12-21 17:41:53 +0800
• 742ce42f5e 发放日期判断 ryoeiken 2020-12-21 17:08:11 +0800
• e54f23dd05 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-21 16:59:26 +0800
• aa4289245f 补贴发放 ryoeiken 2020-12-21 16:59:16 +0800
• fd7108f412 优化获取用餐信息的接口 czx 2020-12-21 15:54:44 +0800
• 96b6b349dc 新增员工停餐接口 czx 2020-12-21 14:48:57 +0800
• 6675d80a92 Merge remote-tracking branch 'origin/master' into master czx 2020-12-21 14:08:31 +0800
• 638ad47e35 新增员工订单生成和取消接口 czx 2020-12-21 14:08:13 +0800
• de0117271d Update .gitignore ryoeiken 2020-12-21 13:53:45 +0800
• 68778311e8 修复订单管理页面 ryoeiken 2020-12-21 13:51:52 +0800
• 1000a577d0 配置文件新增redis数据库索引属性 疯狂的狮子li 2020-12-21 11:58:49 +0800
• 886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 wugh 2020-12-21 11:58:15 +0800
• 78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-21 11:55:32 +0800
• 9e62938b1f 修改获取员工订餐配置信息记录方式 czx 2020-12-21 11:54:05 +0800
• 52264b6e2a 优化多级菜单之间切换无法缓存的问题 RuoYi 2020-12-21 10:50:48 +0800
• fd7e88a518 配置文件新增redis数据库索引属性 RuoYi 2020-12-21 10:26:54 +0800
• 854a6f805f !145 redis 增加 database配置项，设置不同的库 Merge pull request !145 from li_oxen/N/A 若依 2020-12-21 10:13:47 +0800
• 1caec85f46 redis 增加 database配置项，设置不同的库 li_oxen 2020-12-19 10:08:09 +0800
• 690b4e56e8 新增返回员工某一日的订单接口 czx 2020-12-18 17:53:51 +0800
• 805c79506b 代码生成 后端支持 between 疯狂的狮子li 2020-12-18 17:46:05 +0800
• 817da5bc04 修复export与list结果不统一问题 疯狂的狮子li 2020-12-18 16:50:58 +0800
• aa3e2a4f33 表单修正 Machengtianjiang 2020-12-18 16:28:52 +0800
• a514330db3 修复export与list结果不统一的问题 wangxianl 2020-12-18 15:47:07 +0800
• 979a450afd 新增返回员工某一日的订单接口 czx 2020-12-18 14:51:58 +0800
• a8d61ef3be 修改样式 Machengtianjiang 2020-12-18 14:03:33 +0800
• b27fd40ab3 样式调整 Machengtianjiang 2020-12-18 11:30:13 +0800
• ca3a7de834 基本显示完成 Machengtianjiang 2020-12-18 09:58:21 +0800
• 2b0cf24be4 修改 controller 生成器 解决where条件重复bug 疯狂的狮子li 2020-12-18 09:47:35 +0800
• 6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-18 09:45:54 +0800
• b029a7265a 将controller条件查询器改完隐式泛型 疯狂的狮子li 2020-12-18 00:02:40 +0800
• 81d88da5d1 新增返回全部订单接口 czx 2020-12-17 18:00:01 +0800
• 49c1a18e93 start Machengtianjiang 2020-12-17 17:50:57 +0800
• 9dc5505422 完成同步更新三个逻辑 czx 2020-12-17 16:13:51 +0800
• c86dc20743 移除path-to-regexp正则匹配插件 RuoYi 2020-12-17 12:05:29 +0800
• bb88724e20 饭堂系统信息 CRUD ryoeiken 2020-12-17 09:21:46 +0800
• aee6b69d3e Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-17 09:09:30 +0800
• ecc7a8be46 优化多级菜单之间切换无法缓存的问题 RuoYi 2020-12-16 20:57:48 +0800
• 7c0331b7b6 修复员工订单bug czx 2020-12-16 17:30:15 +0800
• f44ff8477f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-16 12:44:21 +0800
• e23ad20186 README RuoYi 2020-12-16 10:20:02 +0800
• 6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 RuoYi 2020-12-16 10:05:53 +0800
• 1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-15 10:25:00 +0800