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

• 7514563e6c 员工报餐：查看补贴余额，查看补贴记录 ryoeiken 2021-01-05 08:44:59 +08:00
• 2116ee1822 Update copyright RuoYi 2021-01-04 17:49:52 +08:00
• 57a2eb4217 操作按钮组调整为朴素按钮样式 RuoYi 2021-01-04 17:48:46 +08:00
• 64e943b681 todo:开票，回款 ryoeiken 2021-01-04 17:32:07 +08:00
• 150676a9ad 食品管理添加用餐类型字段 ryoeiken 2021-01-04 17:27:27 +08:00
• 6bd7ea834f 食品管理添加用餐类型字段 ryoeiken 2021-01-04 17:27:03 +08:00
• b562da3b80 富文本上传图片 Machengtianjiang 2021-01-04 16:42:44 +08:00
• 4bec2d207f 病人配餐设置页面改造 ryoeiken 2021-01-04 15:29:48 +08:00
• d04a9c5cbb 病人配餐默认不开启营养餐 ryoeiken 2021-01-04 15:05:49 +08:00
• 629e81c177 基本完成开票，回款登记 CRUD ryoeiken 2021-01-04 14:50:06 +08:00
• b96b7bbf41 新增，修改营养配餐时一同新增，修改病人配餐设置 ryoeiken 2021-01-04 10:10:20 +08:00
• 873bf7203a Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-31 17:24:43 +08:00
• 2b23508f40 狮子同步最新版本 czx 2020-12-31 17:22:12 +08:00
• 57e016d0f1 Merge remote-tracking branch 'origin/master' into master czx 2020-12-31 17:17:36 +08:00
• 416ed16118 病患营养配餐前端页面 ryoeiken 2020-12-31 17:12:29 +08:00
• f006cb9fba 修复更新用餐时间配置页面bug czx 2020-12-31 14:55:13 +08:00
• 29c6f7f24d cos配置 id配置 Machengtianjiang 2020-12-31 14:40:36 +08:00
• 6cb636ca40 修改参数 ryoeiken 2020-12-31 14:14:30 +08:00
• 2eff99e3c0 报餐表添加新字段 ryoeiken 2020-12-31 13:42:43 +08:00
• baf88a0ea4 完善根据科室获取次日报餐信息 ryoeiken 2020-12-31 11:42:11 +08:00
• 9604f9495d 修复根据科室获取次日报餐信息 ryoeiken 2020-12-31 10:13:57 +08:00
• 81546a3b56 获取菜品清单 ryoeiken 2020-12-31 10:04:54 +08:00
• bf62105bc7 图片上传完美了 Machengtianjiang 2020-12-31 10:00:46 +08:00
• 58ea5fb983 发现bug czx 2020-12-31 09:41:26 +08:00
• ec74a2d3de 修改了对象存储 Machengtianjiang 2020-12-31 09:13:13 +08:00
• d3ac78138a 饭堂参数前端页面 ryoeiken 2020-12-30 17:52:10 +08:00
• 595adb7ae3 送餐员报餐 APP 后端接口，todo：批量更新报餐记录，通知营养科更新营养配餐信息 ryoeiken 2020-12-30 16:36:44 +08:00
• e9d368ed0c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-30 16:20:09 +08:00
• f27e2de7c1 更改默认报餐部门 ryoeiken 2020-12-30 11:24:16 +08:00
• 21f019264e 获取部门列表 ryoeiken 2020-12-30 11:08:58 +08:00
• 969b6aef37 添加注释 ryoeiken 2020-12-30 11:05:00 +08:00
• f9a5efd406 护工获取默认部门信息 ryoeiken 2020-12-30 10:57:17 +08:00
• 339ea49928 护工添加手机号码及密码 ryoeiken 2020-12-30 10:26:25 +08:00
• 48c922a3a9 后端接口：获取指定病患明天的订餐记录,获取指定科室明天的报餐记录 ryoeiken 2020-12-30 09:26:41 +08:00
• d5195dfe9e 修复一对多bug 28353131@qq.com 2020-12-29 22:08:22 +08:00
• 1a6837f49e 一对多完善 czx 2020-12-29 18:41:11 +08:00
• e73d581adf 一对多初步 ryoeiken 2020-12-29 17:49:43 +08:00
• 5d4451ec27 一对多初步 ryoeiken 2020-12-29 17:49:33 +08:00
• 6c80b39059 一对多初步 ryoeiken 2020-12-29 17:48:43 +08:00
• 9e3f618ce2 补贴详情 ryoeiken 2020-12-29 17:46:45 +08:00
• 647af5b485 菜单组件修改允许空字符串 RuoYi 2020-12-29 17:27:48 +08:00
• 3f33219134 !156 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 Merge pull request !156 from li_oxen/N/A 若依 2020-12-29 17:14:31 +08:00
• af23213b9c 修复窗口收费前端 bug ryoeiken 2020-12-29 16:26:59 +08:00
• 418c8b6657 窗口收费 ryoeiken 2020-12-29 16:18:20 +08:00
• a04bb71777 修复 用户管理 -> 修改用户 手机号码 和 邮箱 不能清空 li_oxen 2020-12-29 13:51:15 +08:00
• 63992ac906 代码生成数据库文本类型生成表单文本域 RuoYi 2020-12-29 11:14:48 +08:00
• b8f6731584 增加 demo模块 方便参考扩展 疯狂的狮子li 2020-12-29 10:17:44 +08:00
• a5bdb5072a 员工订餐统计接口，增加部门统计 28353131@qq.com 2020-12-28 23:24:26 +08:00
• 046aba1a2f Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-28 16:49:18 +08:00
• af71ca6da4 todo：收费 ryoeiken 2020-12-28 16:47:51 +08:00
• 241de49166 增加一些商品管理内容 Machengtianjiang 2020-12-28 16:34:06 +08:00
• 43350ad40b bug：订餐配置信息 czx 2020-12-28 14:17:04 +08:00
• 93e7f53cf8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-28 10:40:13 +08:00
• 08864e17b9 优化员工报餐，过来周六日 czx 2020-12-28 10:32:24 +08:00
• 0187344798 Excel注解支持Image图片导出 RuoYi 2020-12-27 10:04:45 +08:00
• f257ee2f6c 临时修改 czx 2020-12-25 17:59:09 +08:00
• 0704a2a51c 修复 日常收费 bug ryoeiken 2020-12-25 14:34:09 +08:00
• c24b912b50 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-25 09:59:24 +08:00
• a9c6ba12e6 代码生成日期控件区分范围 RuoYi 2020-12-25 09:35:20 +08:00
• bb0adb833a 完善订餐逻辑，先删除停餐记录 28353131@qq.com 2020-12-24 22:38:55 +08:00
• ba068eae65 修正侧边栏静态路由丢失问题 RuoYi 2020-12-24 19:32:18 +08:00
• b3e000c255 部署配置 Machengtianjiang 2020-12-24 17:26:13 +08:00
• 49c6164445 端口配置 Machengtianjiang 2020-12-24 17:25:16 +08:00
• ff2e63e3b7 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-24 17:07:44 +08:00
• f84ce6e13f 病人同步 ryoeiken 2020-12-24 17:07:37 +08:00
• ae58cafd81 小程序代码迁移完毕 Machengtianjiang 2020-12-24 16:43:08 +08:00
• e01edd535b 增加统计单日接口 czx 2020-12-24 14:10:16 +08:00
• 69785a0388 返回有效记录接口bug czx 2020-12-24 12:29:19 +08:00
• 32cbe06ec6 优化返回有效记录接口，只返回今天以后的记录 czx 2020-12-24 11:17:28 +08:00
• 357eb123c9 返回菜单接口bug czx 2020-12-24 10:06:03 +08:00
• 476df3117b Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2020-12-24 10:04:54 +08:00
• 5f825db580 增加初始化员工配置记录接口 czx 2020-12-24 09:17:17 +08:00
• ff11bbb16f 优化获取有效停餐记录接口，只返回今天以后的记录 28353131@qq.com 2020-12-23 23:39:34 +08:00
• 4064be7c50 优化菜谱接口，获取某一天的菜谱 28353131@qq.com 2020-12-23 23:29:53 +08:00
• d903c4ebe5 增加今日菜单功能 28353131@qq.com 2020-12-23 23:27:13 +08:00
• 14186cc4af 完成 日常收费 - 收费 功能 ryoeiken 2020-12-23 11:13:12 +08:00
• 422bd341ef 修复 日常收费 - 收费 清空选择日期时错误 ryoeiken 2020-12-23 08:17:36 +08:00
• 21416475a2 收费页面弹出层 ryoeiken 2020-12-22 18:00:07 +08:00
• 1a87ee7c19 防止get请求参数值为false或0等特殊值会导致无法正确的传参 Merge pull request !146 from wugh/hotfix/gitee-issue_I2A5FU 若依 2020-12-22 16:19:51 +08:00
• f0ac254e43 修复 日常收费 - 收费 弹出层错误 ryoeiken 2020-12-22 11:22:02 +08:00
• ef75dedb13 补贴流水列表回显，修复搜索框显示选择字典 ryoeiken 2020-12-22 09:24:11 +08:00
• f29a047f54 修复员工，护工管理页面错误 ryoeiken 2020-12-22 08:44:18 +08:00
• 29b33f393d Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-22 08:40:23 +08:00
• cd24108d93 修改补贴发放提示 ryoeiken 2020-12-22 08:40:16 +08:00
• 3c4b01ab83 权限工具类增加admin判断 DokiYoloo 2020-12-21 19:43:57 +08:00
• bb45ccb720 Merge remote-tracking branch 'origin/master' into master czx 2020-12-21 17:54:46 +08:00
• 16afb20621 修改员工登出功能 czx 2020-12-21 17:54:11 +08:00
• f1040fcf40 修复错误 ryoeiken 2020-12-21 17:43:03 +08:00
• 85747dc9a1 修复前端补贴发放标志不能修改错误 并 根据发放标志插入记录，显示在职员工， ryoeiken 2020-12-21 17:41:53 +08:00
• 742ce42f5e 发放日期判断 ryoeiken 2020-12-21 17:08:11 +08:00
• e54f23dd05 Merge remote-tracking branch 'origin/master' into master ryoeiken 2020-12-21 16:59:26 +08:00
• aa4289245f 补贴发放 ryoeiken 2020-12-21 16:59:16 +08:00
• fd7108f412 优化获取用餐信息的接口 czx 2020-12-21 15:54:44 +08:00
• 96b6b349dc 新增员工停餐接口 czx 2020-12-21 14:48:57 +08:00
• 6675d80a92 Merge remote-tracking branch 'origin/master' into master czx 2020-12-21 14:08:31 +08:00
• 638ad47e35 新增员工订单生成和取消接口 czx 2020-12-21 14:08:13 +08:00
• de0117271d Update .gitignore ryoeiken 2020-12-21 13:53:45 +08:00
• 68778311e8 修复订单管理页面 ryoeiken 2020-12-21 13:51:52 +08:00
• 1000a577d0 配置文件新增redis数据库索引属性 疯狂的狮子li 2020-12-21 11:58:49 +08:00
• 886ce995af [bug修复] 解决get请求,如果参数值为false或0等特殊值会导致无法正确传参 wugh 2020-12-21 11:58:15 +08:00