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

• 355258abbb Merge remote-tracking branch 'origin/master' into master czx 2020-12-04 08:08:21 +0800
• 0e571bde22 病患配餐列表中增加正餐菜品名回显 28353131@qq.com 2020-12-03 23:16:28 +0800
• e6e6a94784 搭建病患配餐页面 ryoeiken 2020-12-03 18:11:09 +0800
• a8567345c9 完善营养套餐管理 ryoeiken 2020-12-03 17:32:17 +0800
• 5da5451cbc 营养配餐设置功能页面 ryoeiken 2020-12-03 16:02:32 +0800
• 107def44eb Merge remote-tracking branch 'origin/master' into master czx 2020-12-03 14:36:18 +0800
• 6d342a00ca 修改病人配餐设置管理，病人营养配餐管理 ryoeiken 2020-12-03 14:35:43 +0800
• 0e2b97a886 升级poi到最新版本4.1.2 RuoYi 2020-12-03 13:28:04 +0800
• 1c7a5faae8 Excel支持注解align对齐方式 RuoYi 2020-12-03 13:26:46 +0800
• d2cef9c40d 新增 关于多数据源事务 疯狂的狮子li 2020-12-03 11:32:29 +0800
• b346036cca 增加 多数据源事务描述 疯狂的狮子li 2020-12-03 11:30:48 +0800
• 5ebd0a971f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-03 11:20:50 +0800
• c50e058953 为所有MP插件增加官方链接 疯狂的狮子li 2020-12-03 11:15:54 +0800
• a3dfa843af 增加 多数据源使用注意事项 疯狂的狮子li 2020-12-03 11:13:58 +0800
• 23868c4fad 防止安全扫描YUI出现的风险提示 RuoYi 2020-12-03 10:26:22 +0800
• a5b4cc6c18 修复每周菜谱翻页异常bug czx 2020-12-03 09:39:43 +0800
• 54ff1d29ef 结算收款功能 czx 2020-12-02 17:47:12 +0800
• 85716eb8d8 结算收款功能（未完） czx 2020-12-02 14:34:36 +0800
• 81a2e5578e 防止预付费重复收款 czx 2020-12-02 09:50:23 +0800
• 1f89abf51d 更新系统标题相关内容 czx 2020-12-02 08:52:48 +0800
• 970a194347 导入getuser包 czx 2020-12-01 17:45:28 +0800
• a5107c5a44 Merge remote-tracking branch 'origin/master' into master czx 2020-12-01 17:42:02 +0800
• 26e0c50d96 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-01 17:41:18 +0800
• ff8737de03 结算管理后端获取最近一次结算时间以及距当前时间的天数 ryoeiken 2020-12-01 17:41:06 +0800
• e2ad86e682 增加判断是否已经支付预付伙食费（未完） czx 2020-12-01 16:55:57 +0800
• 43b05b9781 数据库结构调整createby int --> varchar czx 2020-12-01 16:39:00 +0800
• 147dbe0e15 修复每周菜谱自动计价功能bug czx 2020-12-01 16:07:35 +0800
• d61517cf46 Merge remote-tracking branch 'origin/master' into master czx 2020-12-01 15:30:44 +0800
• 0b5b7db96d 临时 czx 2020-12-01 15:30:17 +0800
• b94f753ae5 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-01 15:29:00 +0800
• 03169452d8 预付费结算判断 ryoeiken 2020-12-01 15:28:46 +0800
• af6b5546c9 结算管理页面调整 czx 2020-12-01 15:26:37 +0800
• 2afb109bff 增加 maven多环境配置注释 疯狂的狮子li 2020-12-01 11:53:55 +0800
• f7f7557d4d 项目修改为 maven多环境配置 疯狂的狮子li 2020-12-01 11:44:29 +0800
• b36b413a69 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-01 09:23:55 +0800
• 3b2669d148 修改缓存监控内存单位 RuoYi 2020-11-30 19:27:03 +0800
• d708c734df 增加查询结算记录（未完） czx 2020-11-30 18:05:14 +0800
• 8657a73b92 修复添加预收费记录默认数据不完整 czx 2020-11-30 15:06:17 +0800
• b4cfb9cb80 完成预付费收费功能 czx 2020-11-30 14:27:06 +0800
• ce438f182a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-11-30 12:41:39 +0800
• 147b7d8896 预付款输入框控制正整数输入 czx 2020-11-30 11:50:00 +0800
• 3e1b7163b0 收费弹出层关联选择按钮 czx 2020-11-30 11:38:54 +0800
• f248b7d4af 预付费管理模块增加结算类型切换 czx 2020-11-30 11:24:12 +0800
• 1147ea5f8a 设置用户头像悬停高度 RuoYi 2020-11-30 11:10:27 +0800
• a1bf5aaf8e 升级element-ui版本到2.14.1 RuoYi 2020-11-30 10:37:48 +0800
• 2797c1eb3a 修正转换字符串的目标字符集属性 RuoYi 2020-11-30 10:31:11 +0800
• 1791d7cf40 !126 update pom.xml. Merge pull request !126 from abbfun/N/A 若依 2020-11-30 10:07:08 +0800
• acf6cf7298 修复bug 28353131@qq.com 2020-11-29 17:03:42 +0800
• 63e2052b9a 改造实现输入建议内容 28353131@qq.com 2020-11-29 16:49:26 +0800
• 01861f0aae update pom.xml. abbfun 2020-11-29 16:16:54 +0800
• 0d16f9158a 初步改造前端页面 28353131@qq.com 2020-11-29 15:16:17 +0800
• a69cc94f35 三级菜单自动配置组件 RuoYi 2020-11-28 20:39:03 +0800
• c666faed66 修复三级菜单之间切换页面无法缓存的问题 RuoYi 2020-11-28 20:31:45 +0800
• 5b598909f7 删除无用的console 28353131@qq.com 2020-11-28 19:03:16 +0800
• ba32570859 增加价格自动计算和格式化回显 28353131@qq.com 2020-11-28 19:02:18 +0800
• d1a5c75da8 优化显示效果，增大菜单栏的长度 28353131@qq.com 2020-11-28 18:33:24 +0800
• 16a6560ff4 优化多选状态下菜品显示，同时显示价格 28353131@qq.com 2020-11-28 18:20:43 +0800
• b3a0332835 优化交互功能，嵌入多选器显示菜单，并可以直接编辑保存 28353131@qq.com 2020-11-28 18:06:38 +0800
• 6072239a40 修改缓存监控内存单位 RuoYi 2020-11-28 13:57:19 +0800
• e3c0bc3c5c 1、完善每周菜谱功能，用户不能添加和删除 2、列表中增加合并列显示效果 3、增加菜品列表 28353131@qq.com 2020-11-28 12:53:37 +0800
• a3b86d6f6d 代码生成删除多余的数字float类型 RuoYi 2020-11-28 12:09:24 +0800
• fd831d5a90 Excel支持导入Boolean型数据 RuoYi 2020-11-28 12:08:55 +0800
• bac94b2f03 修改每周菜谱数据类型，对应修改实体类 28353131@qq.com 2020-11-28 11:16:34 +0800
• 797a9c3cd8 Merge remote-tracking branch 'origin/master' into master czx 2020-11-27 17:48:10 +0800
• 6864c23124 增加填写同步日志功能 czx 2020-11-27 17:47:34 +0800
• 737186308d Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-11-27 17:28:32 +0800
• c696a03232 添加每周食谱 ryoeiken 2020-11-27 17:28:17 +0800
• 0ef4ec268e 增加填充新病患的报餐默认配置数据 czx 2020-11-27 17:13:41 +0800
• 7ab0d24e50 添加病人报餐 ryoeiken 2020-11-26 16:32:01 +0800
• 000f94049b 添加默认报餐表总价格 ryoeiken 2020-11-26 15:45:18 +0800
• 02229ed732 默认报餐表显示 ryoeiken 2020-11-26 15:00:44 +0800
• 820bb00831 完善远程病患同步逻辑 czx 2020-11-26 14:29:20 +0800
• 63d72d7f51 完成同步远程病患数据到本地 czx 2020-11-26 11:29:02 +0800
• a2798f7a1f 不同数据源切换同步远程病患到本地 czx 2020-11-26 09:33:32 +0800
• c91b0f55e5 默认报餐 ryoeiken 2020-11-26 00:40:17 +0800
• 552abab811 Merge remote-tracking branch 'origin/master' ryoeiken 2020-11-26 00:34:50 +0800
• b8428b09fe 默认报餐 ryoeiken 2020-11-26 00:34:39 +0800
• 0bb383d7c2 多数据源，远程病人信息表 28353131@qq.com 2020-11-25 23:09:02 +0800
• a65761757b Merge remote-tracking branch 'origin/master' into master czx 2020-11-25 17:59:06 +0800
• 0cd78a6b7c 多数据源配置 czx 2020-11-25 17:58:14 +0800
• 86c1094e34 默认报餐表 ryoeiken 2020-11-25 17:55:06 +0800
• 0e13b03072 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-11-25 16:19:01 +0800
• 6dbe2daa24 删除护工信息列表多余内容 czx 2020-11-25 16:08:32 +0800
• 9b3fe8d6ee 修复护工绑定科室多选问题 czx 2020-11-25 15:54:03 +0800
• b4e7c3f2a7 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-11-25 15:50:11 +0800
• 783dc47a84 修复护工绑定科室多选问题 czx 2020-11-25 15:46:53 +0800
• ee17361cda Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-11-25 15:14:19 +0800
• 913ced8791 修复启用状态回显bug czx 2020-11-25 11:19:59 +0800
• 82fe6d5c34 多数据源配置 ryoeiken 2020-11-25 10:31:14 +0800
• a35a2ff6f2 人员管理,财务管理-补贴管理 ryoeiken 2020-11-25 09:40:14 +0800
• 6d900dc654 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-11-25 09:30:42 +0800
• 7cdb38b7c9 员工管理护工管理数据分离 ryoeiken 2020-11-24 23:17:51 +0800
• 64bd494733 人员管理 ryoeiken 2020-11-24 17:56:12 +0800
• e83412b9a5 升级oshi到最新版本v5.3.6 RuoYi 2020-11-24 16:17:33 +0800
• 15c4428b9c 修改 ruoyi CharsetKit.java bug 疯狂的狮子li 2020-11-24 11:54:38 +0800
• 20d7c90515 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-11-24 10:03:59 +0800
• 90ac416e02 新增缓存监控功能 RuoYi 2020-11-23 10:02:50 +0800
• 78f06ed7e2 修改前端页面 ryoeiken 2020-11-19 15:52:46 +0800
• 3d3188e399 自动生成 CRUD ryoeiken 2020-11-19 15:15:23 +0800
• 212b781352 配置文件初始化 ryoeiken 2020-11-19 10:31:06 +0800