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

• c55d3a9178 [修改] 错误引入的无用导包删除 #11 wugh 2021-03-21 00:31:23 +08:00
• 372ad49d65 [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码 [新增] 增加插入,修改,删除的校验代码预留. [新增] 增加swagger相关的注解 [修改] 修改AjaxResult和TableDateInfo,增加泛型,是的swagger能正常解析出参数结构用于swagger的参数说明 wugh 2021-03-21 00:28:12 +08:00
• eb46eda48d [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码 wugh 2021-03-20 18:16:10 +08:00
• 939d89f0b8 !10 [BUG] 解决只能使用circle干扰的bug Merge pull request !10 from wugh/hotfix/captcha #10 疯狂的狮子li 2021-03-20 10:14:03 +08:00
• 1270b056d5 [bug修复] 解决调整验证码干扰的类型无效,只用circle的bug [优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码 #10 wugh 2021-03-19 19:28:43 +08:00
• a7f235164f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-03-18 13:08:14 +08:00
• 01b545e4ab 通用Controller添加响应返回消息 RuoYi 2021-03-16 14:43:55 +08:00
• 31ddb2aee3 update swagger 升级为 knife4j 疯狂的狮子li 2021-03-16 12:52:09 +08:00
• c0186580ba fix 修复代码生成缺少jar异常 疯狂的狮子li 2021-03-16 10:57:26 +08:00
• 63a582404b update swagger 模板修改为 swagger-bootstrap-ui 疯狂的狮子li 2021-03-15 17:51:00 +08:00
• 04e1dc351e update 移除无用依赖 疯狂的狮子li 2021-03-15 17:50:24 +08:00
• 7ae2df1390 update 使用hutool 重写 UserAgent 疯狂的狮子li 2021-03-15 17:49:30 +08:00
• 9b4b9e0c74 update 删除通用工具 改为使用hutool 疯狂的狮子li 2021-03-15 16:38:43 +08:00
• 46aa17db9c Merge remote-tracking branch 'origin/master' 疯狂的狮子li 2021-03-15 10:00:49 +08:00
• 71325b540a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-03-15 10:00:14 +08:00
• c2e9200626 数据监控默认账户密码防止越权访问 RuoYi 2021-03-14 16:37:34 +08:00
• 9502203bbe !187 【漏洞修复】升级commons-collections版本，解决3.2.1版本的反序列化漏洞问题 Merge pull request !187 from Delusive/master 若依 2021-03-14 16:32:07 +08:00
• 2509815a4f fix 验证码点击不刷新 bug 疯狂的狮子li 2021-03-14 00:15:29 +08:00
• ff55f5760f 修改 #9 yinguofeng 2021-03-13 15:48:40 +08:00
• 9125046246 修改验证码 yinguofeng 2021-03-13 15:01:58 +08:00
• c5a5c66603 test yinguofeng 2021-03-13 14:10:08 +08:00
• c789c52333 Create test333.txt yinguofeng 2021-03-13 14:09:41 +08:00
• 1544ed4d91 test yinguofeng 2021-03-13 14:08:44 +08:00
• 59cf2fa089 test yinguofeng 2021-03-13 14:06:07 +08:00
• 8ab2cad30d test yinguofeng 2021-03-13 14:02:56 +08:00
• 2086322ed5 test yinguofeng 2021-03-13 13:45:10 +08:00
• 88b5470c87 test yinguofeng 2021-03-13 13:37:58 +08:00
• d1b2a2afae Create test2.txt yinguofeng 2021-03-13 13:34:09 +08:00
• 7603aaafc6 test yinguofeng 2021-03-13 13:27:42 +08:00
• a6ab089a04 Create test.txt yinguofeng 2021-03-13 13:26:41 +08:00
• faacd46fdb 前后端修改 yinguofeng 2021-03-13 13:06:28 +08:00
• 3eb2c79813 公司名称修改 yinguofeng 2021-03-13 11:43:53 +08:00
• 1822e74aaa 修改公司名字 yinguofeng 2021-03-13 11:24:35 +08:00
• 37e254edf5 Pre Merge pull request !8 from yinguofeng/dev #8 yinguofeng 2021-03-13 10:47:51 +08:00
• 92b3e609f9 修改为自用 #8 yinguofeng 2021-03-13 10:46:31 +08:00
• b46b87ea83 Pre Merge pull request !7 from yinguofeng/master #7 yinguofeng 2021-03-13 10:28:13 +08:00
• 2b8ab9cc4d update 使用hutool重写系统监控 #7 疯狂的狮子li 2021-03-12 18:02:23 +08:00
• c0f1569ad9 修复commons-collections引起的反序列化漏洞 hh44h1144 2021-03-12 16:59:06 +08:00
• 57cfad671f update 使用hutool重写验证码生成 疯狂的狮子li 2021-03-12 16:52:55 +08:00
• 9a94ab573d !6 update ruoyi-admin/src/main/resources/application.yml. Merge pull request !6 from hechieh/N/A #6 疯狂的狮子li 2021-03-10 13:34:15 +08:00
• 51d942f14c update ruoyi-admin/src/main/resources/application.yml. #6 hechieh 2021-03-10 13:27:10 +08:00
• 5494ec36e5 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-03-09 09:32:49 +08:00
• 61432480c8 删除多余的代码 RuoYi 2021-03-07 11:06:47 +08:00
• 78deee063d !180 富文本编辑组件支持只读 Merge pull request !180 from JOSWAY/master 若依 2021-03-07 10:44:04 +08:00
• 4ad003649e !182 解决 Byte[] 类型 to string 死循环的问题 Merge pull request !182 from sproutcat/master 若依 2021-03-07 10:39:41 +08:00
• 616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue. Merge pull request !185 from asher/N/A 若依 2021-03-07 10:39:30 +08:00
• fea3ff7b2a !184 update ruoyi-ui/src/views/monitor/operlog/index.vue. Merge pull request !184 from asher/N/A 若依 2021-03-07 10:39:22 +08:00
• f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. asher 2021-03-04 17:00:07 +08:00
• 45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. asher 2021-03-04 16:58:18 +08:00
• 2c2deced02 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-03-03 17:14:21 +08:00
• 0d8c3b4940 升级oshi到最新版本v5.6.0 RuoYi 2021-03-03 13:53:03 +08:00
• 0638f3c1fe Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-02-28 14:39:53 +08:00
• 64e807f27b 添加新群号：186866453 RuoYi 2021-02-24 13:45:24 +08:00
• 9a384a2fc2 解决 Byte[] 类型 to string 死循环的问题 tzg 2021-02-23 16:28:55 +08:00
• 339b932a3d 富文本编辑组件支持只读 Josway 2021-02-22 17:49:17 +08:00
• 9b136e76bb update 3.4.0 疯狂的狮子li 2021-02-22 10:06:18 +08:00
• ac99fddfe6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-02-22 10:04:43 +08:00
• 0b5c7f4c96 若依 3.4.0 RuoYi 2021-02-22 09:40:28 +08:00
• 265e3010aa 升级SpringBoot到最新版本2.2.13 RuoYi 2021-02-21 11:01:56 +08:00
• 66899c4c96 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-02-18 09:12:32 +08:00
• aee23629ea Pre Merge pull request !5 from Admin/dev #5 Admin 2021-02-10 15:30:05 +08:00
• b7a36bfe8a 修改ip字段长度防止ipv6地址长度不够 RuoYi 2021-02-10 12:48:52 +08:00
• 48e6e4454a 修改 prod 数据库配置 #5 ryoeiken 2021-02-10 11:15:31 +08:00
• 8d6c43e457 预付费出院结清，收费 ryoeiken 2021-02-10 10:25:49 +08:00
• ffa745bac0 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-02-10 08:36:35 +08:00
• 50caf7df97 根据配置文件切换模板地址，下载地址 ryoeiken 2021-02-10 08:36:25 +08:00
• 4de95f7dcf 二维码BASE64解码后处理 czx 2021-02-09 17:44:53 +08:00
• d0e6c84aab 二维码BASE64解码后处理 czx 2021-02-09 17:20:46 +08:00
• b55ab83baa todo:预付款收费异常 czx 2021-02-09 16:20:15 +08:00
• f995596733 todo:预付款收费异常 czx 2021-02-09 15:37:10 +08:00
• c11f4b93f2 Merge remote-tracking branch 'origin/dev' into dev czx 2021-02-09 15:00:35 +08:00
• 22caa5c771 修复日常收费翻页的异常 czx 2021-02-09 15:00:17 +08:00
• 31af8dbca2 Merge remote-tracking branch 'origin/dev' into dev ryoeiken 2021-02-09 14:26:34 +08:00
• e0d3b1d432 修复 pdf 预览指向同一个病患 ryoeiken 2021-02-09 14:26:26 +08:00
• fd0cea9af8 修复日常收费翻页的异常 czx 2021-02-09 12:07:24 +08:00
• 43e075ad7d 修复预付费查询功能 czx 2021-02-09 09:54:11 +08:00
• 2c40a892f8 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-02-07 09:18:17 +08:00
• 3a51c53823 角色非自定义权限范围清空选择值 RuoYi 2021-02-06 10:34:12 +08:00
• df504c5c14 修复四级菜单无法显示问题 RuoYi 2021-02-06 09:29:50 +08:00
• f7b253e5d8 增加二维码扫码测试返回接口 czx 2021-02-05 16:56:02 +08:00
• 2461cbe914 报餐逻辑上， 定时生成报餐信息时，增加计算总价的 czx 2021-02-05 13:36:58 +08:00
• d40813ea6b 更新补贴发放前端的筛选响应。 czx 2021-02-05 11:48:37 +08:00
• 230442827f 完成补贴发放后的超过最大上限的自动冲减。 czx 2021-02-05 11:37:05 +08:00
• adaf6abd7b 更新补贴发放功能 czx 2021-02-04 17:42:05 +08:00
• 642f65bab5 优化日常收费查看详情分页操作 czx 2021-02-04 15:12:12 +08:00
• de8d04bf3b bug:修复前端组合开票的判断 czx 2021-02-03 18:03:34 +08:00
• 3e035fe70a bug:修复员工余额订餐时更新余额信息 czx 2021-02-03 17:14:46 +08:00
• 6f0dfa850a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 疯狂的狮子li 2021-02-03 13:38:43 +08:00
• 7a253f1628 优化：新增病患的时候，创建明天的报餐数据。 czx 2021-02-02 18:20:54 +08:00
• baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 RuoYi 2021-02-02 16:25:37 +08:00
• 99af8998bb 修复预付款预览 PDF 大小写转换 bug ryoeiken 2021-02-02 08:49:54 +08:00
• 8fe8982e52 优化打印数值转换中文数字 czx 2021-02-01 18:16:16 +08:00
• ff8a4be89b 优化打印数值转换中文数字 czx 2021-02-01 18:11:00 +08:00
• 8e5f19069d 优化打印数值转换中文数字 czx 2021-02-01 18:09:36 +08:00
• bc5136ebbb pdf 预览 ryoeiken 2021-02-01 17:45:32 +08:00
• 198008366e 小写转大写 ryoeiken 2021-02-01 17:41:33 +08:00
• 9ec7f38f40 打印数值转换中文数字 czx 2021-02-01 17:22:09 +08:00
• 0b2853b600 打印数值转换工具类 czx 2021-02-01 17:03:17 +08:00
• 8ef265891b pdf 预览 ryoeiken 2021-02-01 16:19:44 +08:00
• aebbfd4de4 打印数值转换工具类 czx 2021-02-01 14:49:30 +08:00