Commit Graph

Select branches

Hide Pull Requests

dev

dev_sjs

master

#1

#1

#10

#10

#100

#100

#101

#101

#102

#102

#103

#103

#104

#104

#105

#105

#106

#106

#107

#107

#108

#108

#109

#109

#11

#11

#110

#110

#111

#111

#112

#112

#113

#114

#114

#115

#115

#116

#117

#117

#118

#119

#119

#12

#12

#120

#120

#121

#121

#122

#122

#123

#124

#125

#126

#126

#127

#127

#128

#128

#129

#13

#13

#130

#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

#154

#154

#155

#155

#156

#156

#157

#157

#158

#158

#159

#16

#16

#160

#160

#161

#161

#162

#163

#163

#164

#165

#166

#167

#167

#168

#168

#169

#169

#17

#17

#170

#170

#171

#171

#172

#172

#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

#189

#19

#19

#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

#239

#239

#24

#24

#240

#241

#241

#242

#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

#293

#293

#294

#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

#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

#334

#334

#335

#335

#336

#336

#337

#337

#338

#339

#339

#34

#34

#340

#340

#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

#366

#366

#367

#367

#368

#368

#369

#369

#37

#37

#370

#370

#371

#371

#372

#372

#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

#390

#391

#391

#392

#392

#393

#394

#394

#395

#395

#396

#397

#397

#398

#398

#399

#399

#4

#4

#40

#40

#400

#400

#401

#401

#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

#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

#46

#460

#460

#461

#461

#462

#462

#463

#463

#464

#464

#465

#465

#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

#49

#49

#5

#5

#50

#51

#51

#52

#53

#53

#54

#54

#55

#55

#56

#56

#57

#57

#58

#58

#59

#59

#6

#6

#60

#60

#61

#61

#62

#62

#63

#63

#64

#64

#65

#65

#66

#67

#68

#68

#69

#69

#7

#7

#70

#70

#71

#71

#72

#72

#73

#73

#74

#74

#75

#75

#76

#76

#77

#77

#78

#78

#79

#8

#8

#80

#81

#81

#82

#82

#83

#84

#85

#86

#86

#87

#87

#88

#88

#89

#89

#9

#9

#90

#90

#91

#92

#92

#93

#93

#94

#95

#96

#97

#98

#98

#99

#99

v1.0

v2.0

v2.1

v2.2

v2.3

v3.0

v3.1

v3.2

v3.2.1

v3.3.0

v3.4.0

v3.5.0

v3.6.0

v3.7.0

v3.8.0

v3.8.1

v3.8.2

Mono Color

• 2e0cf47e4c !6 开发分支合并到主分支 Merge pull request !6 from 派大星/xinbo 派大星 2021-09-26 01:20:41 +00:00
• 09bf5c4c1d Pre Merge pull request !212 from leon/master leon 2021-09-26 01:03:32 +00:00
• 30c89b33fe Excel注解支持导入导出标题信息 RuoYi 2021-09-26 09:03:01 +08:00
• 70a25e2a67 update wangxinbo 2021-09-25 19:26:29 +08:00
• f83d147481 update wangxinbo 2021-09-25 19:25:18 +08:00
• bc0b5d4041 update: 优化视频 wangxinbo 2021-09-25 19:22:46 +08:00
• 9f53769f1b Pre Merge pull request !319 from ggg444/N/A ggg444 2021-09-25 09:14:12 +00:00
• 7479ff4b06 修复xss过滤后格式出现的异常 RuoYi 2021-09-25 17:12:37 +08:00
• 821f40882f !332 fix 自动生成代码漏掉 this.#[[$modal]]#.msgError Merge pull request !332 from 疯狂的狮子Li/N/A 若依 2021-09-24 06:50:50 +00:00
• efe5e89da2 Pre Merge pull request !332 from 疯狂的狮子Li/N/A 疯狂的狮子Li 2021-09-24 05:41:55 +00:00
• 02ce9868a7 fix 自动生成代码漏掉 this.#[[$modal]]#.msgError 疯狂的狮子Li 2021-09-24 05:41:55 +00:00
• c8d983b86a 用户管理ui zhanglipeng 2021-09-24 11:50:27 +08:00
• c3e19d9a32 Pre Merge pull request !329 from youge/master youge 2021-09-24 02:08:18 +00:00
• a8f2ff4531 !331 update 代码生成编辑页面 拼写错误修正 Merge pull request !331 from 疯狂的狮子Li/master 若依 2021-09-24 02:07:44 +00:00
• f53ff60642 Pre Merge pull request !331 from 疯狂的狮子Li/master 疯狂的狮子Li 2021-09-24 02:06:48 +00:00
• eaa3baab3c update 代码生成编辑页面 拼写错误修正 疯狂的狮子li 2021-09-24 10:06:23 +08:00
• 6480282826 升级fastjson到最新版1.2.78 RuoYi 2021-09-24 09:28:46 +08:00
• 6197ad5090 !330 优化 记录登录信息，移除不必要的修改 Merge pull request !330 from lihy2021/N/A 若依 2021-09-24 01:27:57 +00:00
• 5e91cbc3ec Pre Merge pull request !330 from lihy2021/N/A lihy2021 2021-09-24 00:41:44 +00:00
• b477e40d3c 优化 记录登录信息，移除不必要的修改 lihy2021 2021-09-24 00:41:43 +00:00
• 86f47d5f3b dialog全屏/还原切换 fukedi 2021-09-23 21:17:44 +08:00
• f8cc7ce328 限流返回类型转换数值型的格式 RuoYi 2021-09-23 19:15:33 +08:00
• 1a5881b1d0 修正服务监控磁盘变量 RuoYi 2021-09-23 19:09:22 +08:00
• 11a3cf4542 添加dialog拖拽 kkk140 2021-09-23 17:42:12 +08:00
• fa124aeb8b 新增通用方法简化模态/缓存使用 RuoYi 2021-09-23 09:57:29 +08:00
• 258335cc65 新增通用方法简化模态/缓存使用 RuoYi 2021-09-23 09:38:16 +08:00
• 6d709f9fab 重置功能修改， ?：只能用在DayOfMonth和DayOfWeek两个域 yjb 2021-09-22 19:00:25 +08:00
• 492ee4fae5 修改Array.indexOf yjb 2021-09-22 18:54:10 +08:00
• 372246c212 托费历史数据 zhanglipeng 2021-09-22 09:57:12 +08:00
• 7266681001 Pre Merge pull request !327 from youge/master youge 2021-09-22 01:03:43 +00:00
• 19b8af7adc Pre Merge pull request !197 from Andot Studio/master Andot Studio 2021-09-22 01:03:29 +00:00
• 3b42abef44 Excel注解支持自定义数据处理器 RuoYi 2021-09-22 09:03:01 +08:00
• 1973e0a1b0 dialog窗口全屏切换 fukedi 2021-09-21 23:53:23 +08:00
• 26f0737c60 防重提交注解支持配置间隔时间/提示消息 RuoYi 2021-09-20 19:09:25 +08:00
• ac94242875 reset dataSourceAspect RuoYi 2021-09-20 19:08:50 +08:00
• 54bfa627f0 防止Excel导入图片可能出现的异常 RuoYi 2021-09-20 19:04:57 +08:00
• 36c058188a 防止记录日志转换出现的异常 RuoYi 2021-09-20 19:04:40 +08:00
• e36632e6bb update ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java. org.springframework.web.cors.CorsConfiguration#setAllowedOriginPatterns xiaoshitou 2021-09-19 16:39:06 +00:00
• a292cccb63 代码生成点击预览重置激活tab RuoYi 2021-09-18 18:58:03 +08:00
• 5ccd9877b4 !325 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空 Merge pull request !325 from 疯狂的狮子Li/master 若依 2021-09-18 10:47:06 +00:00
• 3ae2737de1 Pre Merge pull request !325 from 疯狂的狮子Li/master 疯狂的狮子Li 2021-09-18 10:44:31 +00:00
• 7108ec41b5 !322 Cron表达式生成器关闭时销毁，避免再次打开时存在上一次修改的数据 Merge pull request !322 from muyi/master 若依 2021-09-18 10:43:59 +00:00
• 4934d1b25f Pre Merge pull request !322 from muyi/master muyi 2021-09-18 10:41:41 +00:00
• 5188d56b4a !321 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 Merge pull request !321 from 疯狂的狮子Li/N/A 若依 2021-09-18 10:41:03 +00:00
• 8f7ed66544 update 优化aop语法 使用spring自动注入注解 基于注解拦截的aop注解不可能为空 疯狂的狮子li 2021-09-18 18:20:21 +08:00
• 88f1f8bd5b feat：增加i8n国际化插件；增加语言切换功能；国际化示例页面：登录、用户管理 高新宇 2021-09-18 15:33:33 +08:00
• de2d0f24de Pre Merge pull request !323 from Xiaobear/xiaobear Xiaobear 2021-09-18 03:20:34 +00:00
• 8141b95632 初始化 yhx19991001@gmail.com 2021-09-18 11:20:23 +08:00
• 181f36a0d4 创建分支初始化 yhx19991001@gmail.com 2021-09-18 11:00:22 +08:00
• aaae404b2a Cron表达式生成器关闭时销毁，避免再次打开时存在上一次修改的数据 yjb 2021-09-17 19:14:41 +08:00
• d7b0b9f074 教师绩效考核优化 zhanglipeng 2021-09-17 18:09:49 +08:00
• bdaa5b0e0a 教师绩效考核优化 zhanglipeng 2021-09-17 17:55:08 +08:00
• 03d6ec4ea6 Pre Merge pull request !321 from 疯狂的狮子Li/N/A 疯狂的狮子Li 2021-09-17 09:32:44 +00:00
• f3a8b4625f 修复 全局限流key会多出一个"-" 将其移动到IP后面 去除多余的空格 疯狂的狮子Li 2021-09-17 09:32:43 +00:00
• 12ab8b03d9 使用vue-data-dict，简化数据字典使用 RuoYi 2021-09-17 15:36:54 +08:00
• 9740a679af 教师绩效考核优化 zhanglipeng 2021-09-17 15:11:09 +08:00
• 0e14a5d550 AjaxResult-->AjajxResult<T> swagger APIModel可输出至Schema中 小驴 2021-09-17 09:31:13 +08:00
• 23270c60bc 日志注解新增是否保存响应参数 RuoYi 2021-09-16 16:03:49 +08:00
• 2cb6709323 !318 修复后端主子表代码模板方法名生成错误问题 Merge pull request !318 from 稚屿/N/A 若依 2021-09-16 07:48:08 +00:00
• 1a98878d5e Pre Merge pull request !314 from raymonddddd/N/A raymonddddd 2021-09-16 07:33:46 +00:00
• 322fc39eb8 Pre Merge pull request !318 from 稚屿/N/A 稚屿 2021-09-16 07:33:46 +00:00
• 917bc03a43 !316 禁用DictTag中el-tag渐变动画 Merge pull request !316 from 马小法/master 若依 2021-09-16 07:34:34 +00:00
• 32d21b0f3f 文件预览 paidaxing444 2021-09-15 22:07:22 +08:00
• cce92983fd 优化Excel导出计算sheet数目的方式 1. 导出数据的总条数刚好等于sheet最大行数时，会多产生一个空白sheet 测试代码如下： public static void main(String[] args) { System.out.println("无数据时，1页：" + getTotalPage(sheetSize * 0)); System.out.println("刚好1页：" + getTotalPage(sheetSize * 1)); System.out.println("刚好7页：" + getTotalPage(sheetSize * 7)); System.out.println("1页：" + getTotalPage(200)); System.out.println("2页：" + getTotalPage(sheetSize * 1 + 200)); System.out.println("8页：" + getTotalPage(sheetSize * 7 + 200)); System.out.println("========="); System.out.println("无数据时，1页：" + getTotalPage2(sheetSize * 0)); System.out.println("刚好1页：" + getTotalPage2(sheetSize * 1)); System.out.println("刚好7页：" + getTotalPage2(sheetSize * 7)); System.out.println("1页：" + getTotalPage2(200)); System.out.println("2页：" + getTotalPage2(sheetSize * 1 + 200)); System.out.println("8页：" + getTotalPage2(sheetSize * 7 + 200)); } ggg444 2021-09-15 08:27:45 +00:00
• 042918a532 文件预览和招生页面去除缓存 zhanglipeng 2021-09-15 11:42:50 +08:00
• dbe3446b63 修复后端主子表代码模板方法名生成错误问题 稚屿 2021-09-14 13:53:32 +00:00
• 15efaf5d1e Pre Merge pull request !317 from tam/master tam 2021-09-14 09:02:08 +00:00
• c3506762f7 miniapp tgq 2021-09-14 16:55:39 +08:00
• 98661ac220 Pre Merge pull request !316 from 马小法/master 马小法 2021-09-14 07:22:02 +00:00
• b84e7013d2 禁用el-tag组件的渐变动画 马小法 2021-09-14 15:15:22 +08:00
• 15f5153d4d Pre Merge pull request !315 from 陌寻/master 陌寻 2021-09-13 16:34:34 +00:00
• 9e6d643acf 引入vue-data-dict，简化数据字典使用 moxun1639 2021-09-14 00:23:47 +08:00
• 374afbefda 修复多图组件验证失败被删除问题 之前在issue提出解决方案后被采纳后便继续开发。被回复后希望也能成为贡献者, 补交一个PR handleRemove(file, fileList) { const findex = this.fileList.map(f => f.name).indexOf(file.name); if(findex > -1) { this.fileList.splice(findex, 1); this.$emit("input", this.listToString(this.fileList)); } }, raymonddddd 2021-09-13 07:47:45 +00:00
• db193a46e8 若依 3.7.0 v3.7.0 RuoYi 2021-09-13 09:36:38 +08:00
• 53ddd9966a 修复定时任务新增结果始终为[暂停]状态问题 稚屿 2021-09-10 11:42:21 +08:00
• 04c340627d 修复多图组件验证失败被删除问题 RuoYi 2021-09-10 11:06:25 +08:00
• 98f918b8a8 游戏数学 删除备课优化 zhanglipeng 2021-09-08 16:25:05 +08:00
• c924b208b6 主题整合学习计划打印优化 测试 zhanglipeng 2021-09-08 14:41:14 +08:00
• 15abd4d053 优化提示 RuoYi 2021-09-08 11:26:08 +08:00
• a7376b36f8 !312 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 Merge pull request !312 from 稚屿/master 若依 2021-09-08 03:19:59 +00:00
• 992ae5071b Pre Merge pull request !312 from 稚屿/master 稚屿 2021-09-08 03:19:10 +00:00
• d2b61762b7 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 稚屿 2021-09-08 11:18:35 +08:00
• 3d9924502d Pre Merge pull request !311 from 稚屿/master 稚屿 2021-09-08 02:55:53 +00:00
• 89e8c497a0 Pre Merge pull request !310 from 稚屿/master 稚屿 2021-09-08 02:40:37 +00:00
• 4fbe05ab20 ios 年月 不显示bug zhanglipeng 2021-09-08 10:35:48 +08:00
• 8fe77198d0 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 稚屿 2021-09-08 10:32:18 +08:00
• a5e38f6f99 菜单管理支持配置路由参数 RuoYi 2021-09-08 09:28:23 +08:00
• 4988b585f8 !309 修正单词拼写错误 Merge pull request !309 from 稚屿/master 若依 2021-09-07 08:16:58 +00:00
• bb7b155dbe 1、周计划详情打印 2、微型课程复制 zhanglipeng 2021-09-06 18:30:44 +08:00
• 284602e4ac 1、月计划自动生成子项 2、微型课程 复制 zhanglipeng 2021-09-06 11:33:39 +08:00
• ee8e2fe04b Pre Merge pull request !309 from 稚屿/master 稚屿 2021-09-05 13:42:58 +00:00
• b35f708c07 修正单词拼写错误 linzh 2021-09-05 21:36:33 +08:00
• 3d35107e24 周计划子项禁止删除 zhanglipeng 2021-09-05 17:34:58 +08:00
• 64471c4c8b 周计划子项禁止删除 zhanglipeng 2021-09-05 16:53:26 +08:00
• 54518511d2 月计划过滤查询bug zhanglipeng 2021-09-05 16:11:00 +08:00
• 8f15e3db75 错误信息提示语优化 zhanglipeng 2021-09-05 14:58:34 +08:00
• 6be58b8009 周计划样式优化 zhanglipeng 2021-09-05 14:35:15 +08:00
• 0e6150720c 页签新增关闭左侧 RuoYi 2021-09-05 13:27:58 +08:00
• 44adf03d2c 页签右键按钮添加图标 RuoYi 2021-09-05 13:26:45 +08:00
• 8f8152bc2a 培训视频单ID 无法查询问题 zhanglipeng 2021-09-04 22:31:06 +08:00