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

• 6ad49e59ee
  Pre Merge pull request !627 from QianRj/dev #627 QianRj 2024-12-25 14:50:42 +00:00
• d011a566e4 fix: 修复本部门数据权限sqlTemplate问题 #627 QianRj 2024-12-25 22:47:09 +08:00
• 492e7dab26 fix 修复 未开启sse 找不到bean问题 疯狂的狮子Li 2024-12-25 09:30:14 +08:00
• 5480e419b6 update sqlkeyword 疯狂的狮子Li 2024-12-25 09:23:08 +08:00
• c08f18dfa5
  Pre Merge pull request !625 from AprilWind/dev-excel #625 AprilWind 2024-12-24 03:04:28 +00:00
• 251a617ecc !626 fix 修复excel模板导出异常 * fix: 修复excel模板导出异常 QianRj 2024-12-24 03:04:27 +00:00
• e09180b3d1
  Pre Merge pull request !626 from QianRj/dev #626 QianRj 2024-12-24 02:54:43 +00:00
• 15e9842b0f fix: 修复excel模板导出异常 #626 QianRj 2024-12-24 10:52:02 +08:00
• 88845c24da update 导出Excel（支持自定义字段列选择） #625 AprilWind 2024-12-23 09:43:37 +08:00
• 6a4d0f612b
  Pre Merge pull request !624 from insist/5.X-dev #624 insist 2024-12-21 08:44:52 +00:00
• 6e8d6108b5
  Pre Merge pull request !623 from insist/5.X-dev #623 insist 2024-12-21 08:42:01 +00:00
• 26ff6386d9 Merge branch 'dev' of https://gitee.com/wenlongjia/RuoYi-Vue-Plus into 5.X #624 #623 insist 2024-12-21 16:39:38 +08:00
• 4eba0ee576 fix:添加注释【未登录，则不过滤数据（防止租户未登录 查询数据异常）】 org.dromara.common.mybatis.handler.PlusDataPermissionHandler.getSqlSegment insist 2024-12-21 16:32:22 +08:00
• c526248465 fix(demo): 导出测试单表列表 测试 排除的列字段名称集合 insist 2024-12-21 16:27:43 +08:00
• fb31eea82b fix(ruoyi-common-mybatis): 修复租户未登录用户查询数据异常 insist 2024-12-21 16:25:20 +08:00
• 4e6077cb7c feat(excel): 为 ExcelUtil 类的 exportExcel 方法添加排除列功能 insist 2024-12-21 15:06:13 +08:00
• 36de389fa4 update 增加 赞助商 疯狂的狮子Li 2024-12-21 13:38:24 +08:00
• f4f052deb4 update 增加 赞助商 疯狂的狮子Li 2024-12-21 13:32:19 +08:00
• 3a0fbd45ae update 增加 赞助商 疯狂的狮子Li 2024-12-21 13:30:19 +08:00
• b63231fe8c update 调整驳回记录 gssong 2024-12-21 13:25:26 +08:00
• af98c10285
  Revert "update 获取用户简略信息，祖级部门列表，部门负责人等" 疯狂的狮子Li 2024-12-20 09:06:10 +00:00
• e47319597a update 获取用户简略信息，祖级部门列表，部门负责人等 AprilWind 2024-12-20 16:42:13 +08:00
• 5c009962a1 update 更新warm-flow版本到v1.3.6-m1 AprilWind 2024-12-20 15:59:17 +08:00
• bd82db69b8 update 更新注释信息 AprilWind 2024-12-20 15:43:58 +08:00
• 00bb00a698 fix 临时修复 warm参数读取问题 疯狂的狮子Li 2024-12-20 11:50:52 +08:00
• 08585f7bc8 update warm-flow 1.3.4 => 1.3.5 优化流程图导入 疯狂的狮子Li 2024-12-20 10:36:21 +08:00
• f19202d8a3 update 更新warm-flow版本到v1.3.5 2024-12-20 AprilWind 2024-12-20 10:31:03 +08:00
• 752b026ebe update 增加抄送人名称 AprilWind 2024-12-20 09:54:06 +08:00
• e8ade07f19 update 我的抄送增加申请人以及更新时间 AprilWind 2024-12-20 09:33:49 +08:00
• f20c271972 !622 fix 修正注释错别字和顺序 * fix 修正注释错别字和顺序 zst_2001 2024-12-19 16:26:26 +00:00
• 96158a544d
  Pre Merge pull request !622 from zst_2001/dev #622 zst_2001 2024-12-19 15:59:38 +00:00
• 4de1ac7002 fix 修正注释错别字和顺序 #622 zst 2024-12-19 23:47:57 +08:00
• 52fbeb2ba5
  Pre Merge pull request !621 from zst_2001/5.X #621 zst_2001 2024-12-19 15:54:58 +00:00
• 564a196f76 fix 修正注释错别字和顺序 #621 zst 2024-12-19 23:47:57 +08:00
• dad53204dd update 优化监听事件注释 AprilWind 2024-12-19 18:12:28 +08:00
• 97dca674a0 update 优化流程分类名称翻译回显 AprilWind 2024-12-19 16:21:55 +08:00
• eba319b819 fix 修改根据流程分类id查询 AprilWind 2024-12-19 15:50:21 +08:00
• 764782c58b update 新增流程分类id查询 AprilWind 2024-12-19 14:52:51 +08:00
• ad85fa2016 update 优化 sse工具类 疯狂的狮子Li 2024-12-19 10:54:08 +08:00
• 1a403361c9 update 优化 关闭sse后 使用工具报错 疯狂的狮子Li 2024-12-19 09:19:12 +08:00
• a2730a3422 fix 修复抄送错误 gssong 2024-12-18 20:56:53 +08:00
• 9ad64521d3 update 优化 !pr_610 代码实现 疯狂的狮子Li 2024-12-18 17:46:53 +08:00
• ff76df9ae0 增加导出模板必填、备注 增加单独的导出模板 方法 liyang 2024-12-11 11:27:13 +08:00
• 17905ce018 fix 修复错误判空 AprilWind 2024-12-18 17:13:34 +08:00
• 5ca20c67c9 fix 修复错误判空 AprilWind 2024-12-18 17:13:04 +08:00
• 0f57f489aa update 新增删除流程事件 AprilWind 2024-12-18 17:05:24 +08:00
• 59d7910524 Merge remote-tracking branch 'origin/dev' into warm-flow-future 疯狂的狮子Li 2024-12-18 13:30:23 +08:00
• 575cb766c2
  Pre Merge pull request !610 from 孤舟烟雨/dev #610 孤舟烟雨 2024-12-18 05:29:51 +00:00
• da1cd55c1d update 优化 增加mybatis-plus一键开启/关闭逻辑删除功能 疯狂的狮子Li 2024-12-18 13:30:09 +08:00
• 9e5e589b8d Merge remote-tracking branch 'origin/dev' into warm-flow-future 疯狂的狮子Li 2024-12-18 11:32:50 +08:00
• a65baf5d67 update 优化 增加mybatis-plus一键开启/关闭逻辑删除功能 疯狂的狮子Li 2024-12-18 11:32:14 +08:00
• e26624a351 update 调整sql书写顺序 疯狂的狮子Li 2024-12-18 10:27:56 +08:00
• 4d07a35b1f fix 修复 抄送缺数据问题 与 已完成任务数据取错问题 疯狂的狮子Li 2024-12-18 10:12:29 +08:00
• d9c0d420a7 update 新增根据业务id查询流程实例详细信息 AprilWind 2024-12-18 09:25:46 +08:00
• ab8cd10983 update 调整变量参数 gssong 2024-12-17 20:04:45 +08:00
• bb33a29fb3 update 调整分类接口 gssong 2024-12-17 19:20:02 +08:00
• e9ed89a367 update 统一业务id参数 gssong 2024-12-17 18:58:52 +08:00
• f10ba97c7a update 调整返回参数 gssong 2024-12-17 18:55:23 +08:00
• 00523af5bb update 增加业务id通用查询条件 AprilWind 2024-12-17 18:04:28 +08:00
• 25aac02e2b update 优化代码 修复bug 疯狂的狮子Li 2024-12-17 17:06:36 +08:00
• e745ccc0cb update 优化新增流程分类判断 AprilWind 2024-12-17 17:02:13 +08:00
• 927565c02b Merge remote-tracking branch 'origin/dev' into warm-flow-future 疯狂的狮子Li 2024-12-17 16:56:25 +08:00
• 1adffe70f3 update 调整驳回 gssong 2024-12-17 15:49:31 +08:00
• 489cb52976 !620 update 修改日志颜色 * update 修改日志颜色 * update 修改日志颜色 疯狂的牛子Li 2024-12-17 07:34:15 +00:00
• 834b9949a3
  Pre Merge pull request !620 from 疯狂的牛子Li/修改日志颜色 #620 疯狂的牛子Li 2024-12-17 07:22:52 +00:00
• 6db77d4028 update 修改日志颜色 #620 疯狂的牛子Li 2024-12-17 15:22:47 +08:00
• 95b75de05d update 修改日志颜色 疯狂的牛子Li 2024-12-17 15:10:10 +08:00
• 0e530feee4 update 优化错误注释 AprilWind 2024-12-17 14:28:15 +08:00
• 29f4a88c1a update 优化流程分类sql语句 AprilWind 2024-12-17 14:08:33 +08:00
• ed23976ade update 调整驳回 gssong 2024-12-17 13:22:55 +08:00
• 591f86e4e9
  !619 fix 修复数据权限导致的个人中心的修改头像和修改密码接口错误 Merge pull request !619 from QianRj/dev 疯狂的狮子Li 2024-12-17 05:22:15 +00:00
• e1d6370099
  Pre Merge pull request !619 from QianRj/dev #619 QianRj 2024-12-17 04:43:57 +00:00
• 9768023d38 fix: 修复数据权限导致的个人中心的修改头像和修改密码接口错误 #619 QianRj 2024-12-17 12:35:19 +08:00
• b076574726 update 删除流程分类状态 AprilWind 2024-12-17 11:33:52 +08:00
• 2d8efda0c6 update 增加流程定义防重 AprilWind 2024-12-17 11:17:05 +08:00
• 60af92ed2d
  !618 update 适配 TOPAIM 2.0 单点登录 Merge pull request !618 from 马铃薯头/dev 疯狂的狮子Li 2024-12-16 11:27:49 +00:00
• 71bdb51cbd
  Pre Merge pull request !618 from 马铃薯头/dev #618 马铃薯头 2024-12-16 11:27:16 +00:00
• 4d566071db Merge remote-tracking branch 'origin/dev' into dev #618 xlsea 2024-12-16 19:26:37 +08:00
• de2c5e6c74
  Pre Merge pull request !617 from 马铃薯头/dev #617 马铃薯头 2024-12-16 10:55:53 +00:00
• aface5ded1 update 适配 TOPIAM 2.0 单点登录 #617 xlsea 2024-12-16 18:53:58 +08:00
• 06948b9ad1 [fix] 修复顶级节点添加报错 liyang 2024-12-16 18:28:49 +08:00
• 1885b1445c update 优化代码 修复bug 疯狂的狮子Li 2024-12-16 17:22:16 +08:00
• 0d0725d53e update 优化流程定义增加类别树查询 AprilWind 2024-12-16 17:08:11 +08:00
• 3d5c00f03d update 新增翻译根据流程分类ID查询流程分类名称 AprilWind 2024-12-16 16:29:36 +08:00
• 640981b6d6 update 根据分页对象构建表格分页数据对象 AprilWind 2024-12-16 15:51:45 +08:00
• 568ba3dcfe update 优化流程定义列表名称 AprilWind 2024-12-16 14:44:16 +08:00
• eba12bf236 update 优化流程分类校验 AprilWind 2024-12-16 14:30:39 +08:00
• 8333435770 update 导入流程 支持自定义类别 疯狂的狮子Li 2024-12-16 12:36:56 +08:00
• 903b289591 update 流程案例 增加表单路径 疯狂的狮子Li 2024-12-16 10:51:11 +08:00
• c62df5cecf update 流程定义查询返回表单路径 疯狂的狮子Li 2024-12-16 10:44:27 +08:00
• 6aefbac520 update 优化任务业务层 AprilWind 2024-12-16 09:34:20 +08:00
• b8f5a167c3 fix 修复 请假天数不准确问题 疯狂的狮子Li 2024-12-16 00:21:12 +08:00
• 9221eae06d update 优化驳回 撤销 gssong 2024-12-15 19:08:30 +08:00
• bc61d90d51 update 删除类别查询权限 通用查询不需要加权限 疯狂的狮子Li 2024-12-15 18:16:25 +08:00
• 87afa637ba fix 修复 变量名修改错误 疯狂的狮子Li 2024-12-15 18:13:51 +08:00
• a0bf365f32 Merge branch 'warm-flow-future' of https://gitee.com/dromara/RuoYi-Vue-Plus into warm-flow-future gssong 2024-12-15 17:32:07 +08:00
• 1c2b492e56 update 调整驳回 gssong 2024-12-15 17:31:58 +08:00
• fc8e66299d update 表名类名统一命名 疯狂的狮子Li 2024-12-15 17:31:27 +08:00
• 42d824d03e Merge branch 'warm-flow-future' of https://gitee.com/dromara/RuoYi-Vue-Plus into warm-flow-future gssong 2024-12-15 16:44:05 +08:00
• 5e47e7c261 update 挑战者驳回 撤销 gssong 2024-12-15 16:30:44 +08:00