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

• 78ef398257 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-21 11:55:32 +08:00
• 9e62938b1f 修改获取员工订餐配置信息记录方式 czx 2020-12-21 11:54:05 +08:00
• 52264b6e2a 优化多级菜单之间切换无法缓存的问题 RuoYi 2020-12-21 10:50:48 +08:00
• fd7e88a518 配置文件新增redis数据库索引属性 RuoYi 2020-12-21 10:26:54 +08:00
• 854a6f805f !145 redis 增加 database配置项，设置不同的库 Merge pull request !145 from li_oxen/N/A 若依 2020-12-21 10:13:47 +08:00
• 1caec85f46 redis 增加 database配置项，设置不同的库 li_oxen 2020-12-19 10:08:09 +08:00
• 690b4e56e8 新增返回员工某一日的订单接口 czx 2020-12-18 17:53:51 +08:00
• 805c79506b 代码生成 后端支持 between 疯狂的狮子li 2020-12-18 17:46:05 +08:00
• 817da5bc04 修复export与list结果不统一问题 #3 疯狂的狮子li 2020-12-18 16:50:58 +08:00
• aa3e2a4f33 表单修正 Machengtianjiang 2020-12-18 16:28:52 +08:00
• a514330db3 修复export与list结果不统一的问题 #3 wangxianl 2020-12-18 15:47:07 +08:00
• 979a450afd 新增返回员工某一日的订单接口 czx 2020-12-18 14:51:58 +08:00
• a8d61ef3be 修改样式 Machengtianjiang 2020-12-18 14:03:33 +08:00
• b27fd40ab3 样式调整 Machengtianjiang 2020-12-18 11:30:13 +08:00
• ca3a7de834 基本显示完成 Machengtianjiang 2020-12-18 09:58:21 +08:00
• 2b0cf24be4 修改 controller 生成器 解决where条件重复bug 疯狂的狮子li 2020-12-18 09:47:35 +08:00
• 6c8497f632 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-18 09:45:54 +08:00
• b029a7265a 将controller条件查询器改完隐式泛型 疯狂的狮子li 2020-12-18 00:02:40 +08:00
• 81d88da5d1 新增返回全部订单接口 czx 2020-12-17 18:00:01 +08:00
• 49c1a18e93 start Machengtianjiang 2020-12-17 17:50:57 +08:00
• 9dc5505422 完成同步更新三个逻辑 czx 2020-12-17 16:13:51 +08:00
• c86dc20743 移除path-to-regexp正则匹配插件 RuoYi 2020-12-17 12:05:29 +08:00
• bb88724e20 饭堂系统信息 CRUD ryoeiken 2020-12-17 09:21:46 +08:00
• aee6b69d3e Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-17 09:09:30 +08:00
• ecc7a8be46 优化多级菜单之间切换无法缓存的问题 RuoYi 2020-12-16 20:57:48 +08:00
• 7c0331b7b6 修复员工订单bug czx 2020-12-16 17:30:15 +08:00
• f44ff8477f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-16 12:44:21 +08:00
• e23ad20186 README RuoYi 2020-12-16 10:20:02 +08:00
• 6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 RuoYi 2020-12-16 10:05:53 +08:00
• 1249c7ca26 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-15 10:25:00 +08:00
• 67198aede9 README RuoYi 2020-12-15 10:06:12 +08:00
• 4f33da2a3f 登录后push添加catch防止出现检查错误 RuoYi 2020-12-15 10:04:09 +08:00
• 145b466bbe Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-14 17:42:35 +08:00
• 025ae3c117 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-14 17:41:13 +08:00
• 21a2fcfed6 新增获取当天员工订单接口 czx 2020-12-14 17:40:34 +08:00
• 16e2baae11 Merge remote-tracking branch 'origin/master' into master czx 2020-12-14 17:26:45 +08:00
• 1ec7073027 同步升级 3.3 疯狂的狮子li 2020-12-14 09:28:15 +08:00
• 7e476b941e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-14 09:27:27 +08:00
• 8988d0b4ab 若依 3.3.0 RuoYi 2020-12-14 09:02:10 +08:00
• ceefa20aa2 调整代码生成页列宽 RuoYi 2020-12-13 16:05:49 +08:00
• 89e1f2a53f 修改Set可能导致嵌套的问题 RuoYi 2020-12-13 15:01:03 +08:00
• 6800a12014 !138 修改Set可能导致嵌套的问题 Merge pull request !138 from BecomeDream/N/A 若依 2020-12-13 14:54:17 +08:00
• 8d4f3561d5 修复mybatis-plus插件不生效bug 疯狂的狮子li 2020-12-11 18:45:57 +08:00
• e8f63b2994 修改Set可能导致嵌套的问题 BecomeDream 2020-12-11 18:16:57 +08:00
• 11a7baeb03 新增获取当天员工订单接口 czx 2020-12-11 18:11:38 +08:00
• ecfe7006e2 代码生成预览支持高亮显示 RuoYi 2020-12-11 17:04:54 +08:00
• 8b88d91312 update README.md 疯狂的狮子li 2020-12-11 14:44:07 +08:00
• 1540db84df 新增获取当天员工订单接口 czx 2020-12-11 14:42:05 +08:00
• f56f57a236 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-11 14:27:54 +08:00
• 9e387dc447 去除用户手机邮箱部门必填验证 RuoYi 2020-12-11 13:26:14 +08:00
• 231bbf6928 !135 增加日志记录过滤对象类型（解决多文件场景报错） Merge pull request !135 from geruishi/master 若依 2020-12-11 13:24:03 +08:00
• fe51f511a4 1、修复员工登录更新状态bug 2、返回配置信息bug czx 2020-12-11 11:10:28 +08:00
• d6eac2dc8d 前端更新插件版本 RuoYi 2020-12-11 09:27:12 +08:00
• a01ff2cbc4 员工订餐前端获取配置信息接口 28353131@qq.com 2020-12-10 22:45:45 +08:00
• 9e1f48d9d8 优化登录接口，记录登录状态，返回uuid 28353131@qq.com 2020-12-10 21:43:33 +08:00
• 89d06362a7 优化员工自动报餐sql，增加计算最新价格 czx 2020-12-10 17:57:56 +08:00
• cb8614201d 添加定时器，定时生成员工订餐记录 czx 2020-12-10 13:33:17 +08:00
• b368ad764f 升级core-js到最新版本3.8.1 RuoYi 2020-12-10 12:08:18 +08:00
• ffd5f0ce5d 升级vue-router到最新版本3.4.9 RuoYi 2020-12-10 11:14:44 +08:00
• a50beae599 代码生成预览提供滚动机制 RuoYi 2020-12-10 11:13:39 +08:00
• 84125a0f72 调整员工信息表结构 czx 2020-12-10 09:57:29 +08:00
• 31c9f6a7aa Merge remote-tracking branch 'origin/master' into master czx 2020-12-09 17:48:54 +08:00
• 4cb7ae256e 员工端登录返回 czx 2020-12-09 17:48:05 +08:00
• 6d4d7ef8f1 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-09 17:34:36 +08:00
• 56aa0ed630 完善 日常收费-收费功能 ryoeiken 2020-12-09 17:34:21 +08:00
• 4e56f30381 修改 生成器controller模板缺导包 与 index页面兼容性 Merge pull request !2 from dragonwzj/master #2 疯狂的狮子li 2020-12-09 16:49:24 +08:00
• fe39a7bc7b 模板controller导入；模板vue列表页当有查询条件时报错 #2 wangzhijun 2020-12-09 16:16:53 +08:00
• cf7f51a633 解决多文件上传Log报错 葛瑞士 2020-12-09 16:05:09 +08:00
• 5109eb0e7e 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 疯狂的狮子li 2020-12-09 13:37:04 +08:00
• 583738fa65 日志输出改回相对路径 解决新版idea 编译user.dir会指定到idea配置目录下 疯狂的狮子li 2020-12-09 13:33:41 +08:00
• 55f5939808 Merge remote-tracking branch 'origin/master' into master czx 2020-12-09 11:38:12 +08:00
• 48497f5d4b 预付费问题修复 czx 2020-12-09 11:37:27 +08:00
• f96f3264f0 添加日常收费-收费功能 ryoeiken 2020-12-09 11:31:10 +08:00
• 49c93f59eb 实现首次结算的时候，提示这个病人是首次收费，不显示上次结算日期 ryoeiken 2020-12-09 10:39:23 +08:00
• 4d46f4c1b5 删除用户和角色解绑关联 RuoYi 2020-12-09 10:32:53 +08:00
• a941c1b488 !134 修改 代码生成 预览无法左右滑动 Merge pull request !134 from 〝走走停停/master 若依 2020-12-09 10:27:34 +08:00
• 206fecd2b0 添加饭堂初始化数据库 ryoeiken 2020-12-09 09:50:57 +08:00
• 4934bfa730 修改结算管理弹出层 ryoeiken 2020-12-09 08:48:09 +08:00
• 742b0ae527 修改本地开发测试数据库配置文件 ryoeiken 2020-12-09 08:25:00 +08:00
• 4ba16c1c1b 修复添加营养配餐没有餐号显示的bug 28353131@qq.com 2020-12-08 22:42:35 +08:00
• 32f30e6e57 Merge remote-tracking branch 'origin/master' into master czx 2020-12-08 18:14:39 +08:00
• 38cf0af13a 增加营养配餐合并列显示 czx 2020-12-08 18:13:32 +08:00
• 26f6e4e264 CRUD开票模块 ryoeiken 2020-12-08 18:12:18 +08:00
• d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 〝走走停停 2020-12-08 17:49:51 +08:00
• fbc071a573 关闭页签清理缓存数据 RuoYi 2020-12-08 16:43:26 +08:00
• 5a62019cdd 更新 如何修改为Tomcat相关注释配置与说明 疯狂的狮子li 2020-12-08 16:21:30 +08:00
• 6cfff90b4a 缓存仪表图设置默认大小 RuoYi 2020-12-08 16:13:21 +08:00
• 474cca921e 回显数据字典防止空值报错 RuoYi 2020-12-08 16:12:00 +08:00
• 1657e06be6 !132 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. Merge pull request !132 from abbfun/N/A 若依 2020-12-08 16:03:51 +08:00
• 33136439d5 员工性别回显 ryoeiken 2020-12-08 15:10:07 +08:00
• ad876c378c 修改生产环境数据库地址 ryoeiken 2020-12-08 15:09:36 +08:00
• 2aab3d0f48 前端员工订餐接口定义 czx 2020-12-08 11:56:06 +08:00
• e2fa131cf9 配餐功能营养配餐显示 ryoeiken 2020-12-08 11:48:31 +08:00
• 33fe8c08bb 完善配餐功能修改 ryoeiken 2020-12-08 11:31:29 +08:00
• c01eeb8521 update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java. abbfun 2020-12-08 11:11:34 +08:00
• 2cf46f7fc8 修复员工，护工管理查询错误 ryoeiken 2020-12-08 08:12:34 +08:00
• 914cc24d5b Merge remote-tracking branch 'origin/master' ryoeiken 2020-12-07 23:23:48 +08:00
• 42d10696c3 修复修改病人配餐不能读取病人信息 bug ryoeiken 2020-12-07 23:23:37 +08:00
• e59cb4ee64 构建生成次日报餐记录的sql脚本 28353131@qq.com 2020-12-07 22:41:49 +08:00
• 832ab863a2 Merge remote-tracking branch 'origin/master' 28353131@qq.com 2020-12-07 22:24:43 +08:00