RuoYi

Commit Graph

Select branches

Hide Pull Requests

master

#1

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#110

#110

#111

#111

#112

#112

#113

#113

#114

#114

#115

#115

#116

#116

#117

#117

#118

#118

#119

#119

#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

#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

#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

#19

#19

#190

#191

#191

#192

#192

#193

#193

#194

#194

#195

#195

#196

#196

#197

#197

#198

#198

#199

#199

#2

#20

#20

#200

#200

#201

#201

#202

#202

#203

#203

#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

#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

#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

#293

#294

#294

#295

#295

#296

#296

#297

#297

#298

#298

#299

#299

#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

#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

#369

#37

#37

#370

#370

#371

#371

#372

#372

#373

#373

#374

#375

#375

#376

#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

#391

#392

#392

#393

#393

#394

#394

#395

#395

#396

#396

#397

#397

#398

#398

#399

#399

#4

#40

#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

#42

#420

#420

#421

#421

#422

#422

#423

#423

#424

#424

#425

#425

#426

#426

#427

#427

#428

#428

#429

#429

#43

#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

#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

#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

#482

#483

#483

#484

#484

#485

#485

#486

#486

#487

#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

#50

#50

#500

#500

#501

#501

#51

#51

#52

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#66

#67

#67

#68

#68

#69

#69

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#742939

#75

#75

#76

#76

#77

#77

#78

#78

#780139

#786641

#788658

#788913

#79

#79

#791045

#791183

#794411

#8

#80

#80

#801369

#802025

#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

#98

#99

#99

v2.2

v2.3

v2.4

v3.0

v3.1

v3.2

v3.3

v3.4

v4.0

v4.1

v4.2

v4.3

v4.3.1

v4.4

v4.5.0

v4.5.1

v4.6.0

v4.6.1

v4.6.2

v4.7.0

v4.7.1

v4.7.2

v4.7.3

v4.7.4

v4.7.5

v4.7.6

v4.7.7

v4.7.8

v4.7.9

8f97486b0c

Pre Merge pull request !386 from Princess-Y/test Princess-Y 2022-05-17 08:41:33 +0000
34761f070a 没有创建分支修改了 zhangyao 2022-05-17 16:39:37 +0800
b2c1a47269 代码提交 zhengzheng 2022-05-16 20:50:56 +0800
f07a8a17d7 代码提交 zhengzheng 2022-05-15 17:29:47 +0800
12702a79c1 代码提交 zhengzheng 2022-05-15 17:06:37 +0800
a9da94486f Merge branch 'master' of https://gitee.com/mnisummer/RuoYi mnisummer 2022-05-13 21:43:50 +0800
d7022010ea 调整组合表头示例，新增合并行 mnisummer 2022-03-30 15:10:57 +0800
8ca74335b7

Pre Merge pull request !385 from np/N/A np 2022-05-11 01:58:31 +0000
8a85536e62

Pre Merge pull request !384 from 阿超/master 阿超 2022-05-11 01:58:30 +0000
2815e4ab1d

Pre Merge pull request !297 from knifeedge/N/A knifeedge 2022-05-11 01:58:15 +0000
5142e2d668 升级oshi到最新版本6.1.6 RuoYi 2022-05-11 09:55:07 +0800
62f2da947a 代码提交 zhengzheng 2022-05-09 17:13:28 +0800
ef1cf982e3 优化excel创建表格样式 RuoYi 2022-05-09 16:57:05 +0800
2131a93287 代码提交 zhengzheng 2022-05-08 18:28:36 +0800
db2153b9af 代码提交 zhengzheng 2022-05-08 01:15:47 +0800
12d550d2b6

update ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java. 优化Switch case np 2022-05-06 02:13:00 +0000
e5ed5ea70d 代码提交 zhengzheng 2022-05-05 13:51:46 +0800
b3c9ce4395 代码提交 zhengzheng 2022-05-05 12:38:13 +0800
68f404937d 代码提交 zhengzheng 2022-05-05 12:04:27 +0800
23730fab90 代码提交 zhengzheng 2022-05-05 11:57:47 +0800
97cd8e38ef 代码提交 zhengzheng 2022-05-05 11:34:31 +0800
3198879445 代码提交 zhengzheng 2022-05-05 10:10:42 +0800
2304f95b13 新增SpringUtils.getRequiredProperty，以静态方式获取配置文件中的值 VampireAchao 2022-05-04 22:38:03 +0800
2f2be1c25a 代码提交 zhengzheng 2022-05-04 22:29:15 +0800
aead4835fe 提交代码 zhengzheng 2022-05-04 16:39:05 +0800
ca557f38c4 提交代码 zhengzheng 2022-05-04 16:22:50 +0800
f9257de2fe 代码提交 zhengzheng 2022-05-04 11:16:15 +0800
af70ac52e8 代码提交 zhengzheng 2022-05-03 23:08:46 +0800
de51cad5a5 代码提交 zhengzheng 2022-05-02 14:28:42 +0800
41a1a630af 代码提交 zhengzheng 2022-05-01 12:16:43 +0800
45e719f0a2 代码提交 zhengzheng 2022-05-01 09:44:08 +0800
a4be143104 升级spring-boot到最新版本2.5.13 RuoYi 2022-04-30 16:38:27 +0800
85b1139b1c

Pre Merge pull request !351 from kedaji/dev kedaji 2022-04-25 02:25:54 +0000
0209ed0326 修改显示顺序orderNum类型为整型 RuoYi 2022-04-25 10:23:17 +0800
d52e067db7

Pre Merge pull request !383 from 袁阳/develop_yuanyang 袁阳 2022-04-23 15:51:15 +0000
ff697d5a43 1.新增客户管理模块(test)：增加sys_client表，并对其实现增删改查 yuanyang_jr 2022-04-23 23:47:42 +0800
55846c5658 Excel注解支持color字体颜色 RuoYi 2022-04-23 20:28:09 +0800
799815c273 表格冻结列阴影效果显示 RuoYi 2022-04-23 20:27:57 +0800
baa689b098 树表格操作时保留ajaxParams初始参数 RuoYi 2022-04-22 10:04:01 +0800
f3d572758a

Pre Merge pull request !382 from pengsui/master pengsui 2022-04-22 01:19:56 +0000
51a536f349 数据库配置修改 pengsui 2022-04-22 08:51:00 +0800
1625d30ace 代码提交 zhengzheng 2022-04-21 14:41:56 +0800
039acf7a79 代码提交 zhengzheng 2022-04-19 16:40:01 +0800
e4bc44115a 设置分页参数默认值 RuoYi 2022-04-17 10:18:56 +0800
53bb1da7a1 优化主子表单删方法 RuoYi 2022-04-17 10:18:19 +0800
977ceb562e 新增获取不带后缀文件名称方法 RuoYi 2022-04-17 10:17:47 +0800
0264da8d7c 主子表操作列新增单个删除 RuoYi 2022-04-16 21:42:30 +0800
94e23ec0f8 检查定时任务bean所在包名是否为白名单配置 RuoYi 2022-04-16 21:42:09 +0800
7610e138dc 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） RuoYi 2022-04-16 21:41:24 +0800
3200777e49 Changes zhengzheng 2022-04-15 22:03:13 +0800
e6a0268091 Changes zhengzheng 2022-04-15 21:40:42 +0800
e5f9f26408 代码提交 zhengzheng 2022-04-15 21:26:09 +0800
b04c6833a3 升级shiro到最新版本1.9.0 RuoYi 2022-04-14 19:00:03 +0800
323fbcbaae

update ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java. 新增一个对list数据源将其里面的数据根据字段分组导入到excel表单的方法友人A 2022-04-13 03:34:49 +0000
435defcf84 代码提交 zhengzheng 2022-04-12 17:11:43 +0800
0d3b23f98f 代码提交 zhengzheng 2022-04-12 16:46:13 +0800
b478ad3aad

!3 1 Merge pull request !3 from zhuobaoji/master zhuobaoji 2022-04-11 02:49:42 +0000
e872d46284 !2 1 * 修复Excel注解prompt/combo同时使用不生效问题 * 用户缓存信息添加部门ancestors祖级列表 * 修复URL类型回退键被禁止问题 * 优化菜单侧边栏滚动条尺寸及颜色 * 升级spring-boot到最新版本2.5.12 防止RCE漏洞 * 新增清理分页的线程变量方法 * 升级spring-boot到最新版本2.5.11 * 升级fastjson到最新版1.2.80 * 优化IP地址获取到多个的问题 * 优化导出excel单元格验证,包含变更为开头.防止正常内容被替换 * 添加新群号：139845794 * 修复初始化多表格处理回调函数时获取的表格配置不一致的问题。 * 自定义ShiroFilterFactoryBean防止中文请求被拦截 * 优化导出数据LocalDateTime类型无数据问题 * 文件上传兼容Weblogic环境 * 修复导入Excel时字典字段类型为Long转义为空问题 * 修复表格打印组件不识别多层对象属性值问题(I4V7YV) zhuobaoji 2022-04-07 02:52:45 +0000
0c41b8fb51 代码提交 zhengzheng 2022-04-05 11:18:52 +0800
838a52cb58 代码提交 zhengzheng 2022-04-05 11:08:44 +0800
035c326071 修复Excel注解prompt/combo同时使用不生效问题 RuoYi 2022-04-03 18:23:21 +0800
e7660d94c9 用户缓存信息添加部门ancestors祖级列表 RuoYi 2022-04-03 18:22:11 +0800
5f996472e1 修复URL类型回退键被禁止问题 RuoYi 2022-04-03 18:19:44 +0800
7cbdc0eb8e 优化菜单侧边栏滚动条尺寸及颜色 RuoYi 2022-04-03 18:19:02 +0800
615aa58bea 升级spring-boot到最新版本2.5.12 防止RCE漏洞 RuoYi 2022-04-02 10:05:49 +0800
9498f578d7 Merge remote-tracking branch 'origin/master' mnisummer 2022-04-02 08:55:36 +0800
cecbde26c4 调整组合表头示例，新增合并行 mnisummer 2022-03-30 15:10:57 +0800
de7e2f1bfc 新增清理分页的线程变量方法 RuoYi 2022-03-31 11:52:39 +0800
cad0d0d2f6 调整组合表头示例，新增合并行 mnisummer 2022-03-30 15:10:57 +0800
0c29e0f3aa Pre Merge pull request !379 from mnisummer/master mnisummer 2022-03-30 06:56:25 +0000
7adef6296e Merge remote-tracking branch 'origin/master' mnisummer 2022-03-30 14:56:20 +0800
9c6f9ebda4 整理DateUtils工具类 mnisummer 2022-03-30 10:50:53 +0800
f108949052 调整组合表头示例，包含合并行&合并列 mnisummer 2022-03-29 17:21:06 +0800
3db82c21d6 Merge branch 'master' of https://gitee.com/y_project/RuoYi mnisummer 2022-03-30 13:41:55 +0800
2d13007ab1 整理DateUtils工具类 mnisummer 2022-03-30 10:50:53 +0800
41bf76a49f 升级spring-boot到最新版本2.5.11 RuoYi 2022-03-30 10:47:27 +0800
2a2744a1bf 升级fastjson到最新版1.2.80 RuoYi 2022-03-30 10:47:15 +0800
cd5b0ac861 调整组合表头示例，包含合并行&合并列 mnisummer 2022-03-29 17:21:06 +0800
bcaf1c3cfc

首页描述中标点符号错误 szluyu99 2022-03-29 08:27:41 +0000
757c0eebaf 优化IP地址获取到多个的问题 RuoYi 2022-03-27 11:31:48 +0800
551989b612 Pre Merge pull request !377 from fang.liu/master fang.liu 2022-03-27 03:11:21 +0000
f60cb25245 优化导出excel单元格验证,包含变更为开头.防止正常内容被替换 RuoYi 2022-03-27 11:08:58 +0800
191dba93ee 1 sf_zhengweigang 2022-03-25 16:24:16 +0800
aa75b99cfc !1 1 * 添加新群号：139845794 * 修复初始化多表格处理回调函数时获取的表格配置不一致的问题。 * 自定义ShiroFilterFactoryBean防止中文请求被拦截 * 优化导出数据LocalDateTime类型无数据问题 * 文件上传兼容Weblogic环境 * 修复导入Excel时字典字段类型为Long转义为空问题 * 修复表格打印组件不识别多层对象属性值问题(I4V7YV) zhuobaoji 2022-03-25 08:15:58 +0000
96fad72b05 Pre Merge pull request !375 from boronga/N/A boronga 2022-03-24 01:51:24 +0000
c23dd66987 Pre Merge pull request !280 from qiuhun1991/ruoyi_change qiuhun1991 2022-03-24 01:51:16 +0000
199eb3f191 添加新群号：139845794 RuoYi 2022-03-24 09:48:37 +0800
de793ec01d ä¿修复获取客户端IP返回多个ip的问题 fang 2022-03-23 20:12:49 +0800
272def3dab Pre Merge pull request !376 from 李秉林/N/A 李秉林 2022-03-23 06:18:01 +0000
009ca62f31

update sql/ry_20210924.sql. 李秉林 2022-03-23 06:18:00 +0000
c1de1113c4 修复初始化多表格处理回调函数时获取的表格配置不一致的问题。清溪先生 2022-03-22 20:40:20 +0800
31065e293e

fix(ruoyi-admin): 修复js调用i18n方法失败在初始化时,fileNames被覆盖了,故删除掉覆盖代码'fileNames = [longFileName];'; boronga 2022-03-22 07:48:00 +0000
c645294ac1 代码提交 zhengzheng 2022-03-22 09:16:52 +0800
1c1d992ab7 代码提交 zhengzheng 2022-03-20 14:25:54 +0800
8c1ad942d4 代码提交 zhengzheng 2022-03-20 14:25:27 +0800
f3e48f62ea 代码提交 zhengzheng 2022-03-20 11:18:02 +0800
3688132b04 代码提交 zhengzheng 2022-03-18 20:22:29 +0800
545cb01fa6 代码提交 zhengzheng 2022-03-18 18:34:22 +0800
58cc5f80db Pre Merge pull request !360 from 网游之鱼/master 网游之鱼 2022-03-17 11:55:42 +0000
19803715be 自定义ShiroFilterFactoryBean防止中文请求被拦截 RuoYi 2022-03-17 19:53:16 +0800