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

Mono Color

• 23cc4c4cbe first-commit gxl 2021-05-22 21:59:02 +0800
• c1aa0c7276 点击个人中心修改用户信息后，右上角用户名不能级联变化 修改点击确认按钮后刷新父页面即可 by xiaofu 2021-05-20 xiaofu 2021-05-20 12:20:58 +0800
• b9f7bf8870 Pre Merge pull request !293 from 万象初新/N/A 万象初新 2021-05-17 14:50:36 +0800
• c39bded7ff ceshi 万象初新 2021-05-17 14:50:35 +0800
• 9f30aea09b Pre Merge pull request !283 from 守望者/master 守望者 2021-05-16 11:03:59 +0800
• fc5f715a77 升级layer到最新版本v3.5.0 RuoYi 2021-05-16 11:02:53 +0800
• b580af1bf3 升级layui到最新版本v2.6.6 RuoYi 2021-05-16 11:02:38 +0800
• 478a807ffd 升级laydate到最新版本v5.3.0 RuoYi 2021-05-16 11:02:18 +0800
• 4d55f5df17 动态生成密匙，防止默认密钥泄露 RuoYi 2021-05-15 21:54:32 +0800
• 06346d36e8 解决执行完毕，没有返回值的问题~ wudi 2021-05-11 11:11:34 +0800
• b9b2b866b2 使用预定义的常量，避免实例化对象 RuoYi 2021-05-11 10:35:49 +0800
• 9f113b9bf0 Pre Merge pull request !291 from CANYON/master CANYON 2021-05-11 10:28:40 +0800
• 4efad1cd1b !289 [bug修复]树级结构更新子节点的anecstors字段时应把replace替换为replaceFirst Merge pull request !289 from zhengxl5566/master 若依 2021-05-11 10:27:54 +0800
• f392c41f3e !285 移除多余的if else Merge pull request !285 from Hacker/N/A 若依 2021-05-11 10:26:25 +0800
• 855dfd6b5b !288 [Bug修复]: 修复了删除操作日志时没有记录日志的bug Merge pull request !288 from lyqwer/master 若依 2021-05-11 10:23:34 +0800
• 6d767daf9e Aspect 切面 wudi 2021-05-10 17:40:05 +0800
• d248384b4f 增加支持 profiles 配置； 区分 开发和生产环境 ； 增加druid数据库加密配置， 生产环境 数据库密码加密。 wudi 2021-05-10 13:28:26 +0800
• 56c00e2589 update READMD.md wudi 2021-05-10 10:30:51 +0800
• 34b2326005 Merge branch 'master' of https://gitee.com/RunCoder/RuoYi.git wudi 2021-05-10 10:19:21 +0800
• c6a6bec510 # 修复文件上传时java.nio.file.FileAlreadyExistsException libin 2021-05-08 15:18:11 +0800
• 10cb35cc82 Pre Merge pull request !290 from hulu204/dev/李聪燕 hulu204 2021-05-05 13:10:11 +0800
• 93552e928c 三个模æ块 hulu204 2021-05-05 13:07:35 +0800
• dd21e6c72c 删除文件 sql/水泥环.sql hulu204 2021-05-04 21:02:08 +0800
• 9d279a01e6 修改数据库中æ¶液体æ 表中属性为ånull，把三个sql文件合为一个†hulu204 2021-05-04 20:58:11 +0800
• 6a14c954e1 [fix]字符串替换bug，replace会从前往后替换所有target，"0,104".replace("0","0,1")的结果是"0,1,10,14"。 此处代码的本意是替换第一个符合的target字符串，应使用replaceFirst zhengxl5566 2021-04-30 16:57:05 +0800
• e29357a612 实例演示弹层组件增加相册层示例 Ricky 2021-04-30 14:04:25 +0800
• 1b4c35dbd7 主子表操作封装处理增加文本域类型 Ricky 2021-04-30 13:43:21 +0800
• f0c32bc34b 实例演示中弹出表格增加以回调形式回显到父窗体 Ricky 2021-04-30 13:10:04 +0800
• 0e9d6794f3 调整验证码路径和代码生成模板注释 Ricky 2021-04-30 12:07:32 +0800
• 52c9227245 基础产品 WangHao 2021-04-29 23:24:25 +0800
• b89d0573b8 [Bug修复]: 修复了删除操作日志时没有记录日志的bug,让部分权限狗清理作案痕迹时会留下马脚 ly 2021-04-29 17:45:21 +0800
• 121e63de8b Pre Merge pull request !287 from lyqwer/master lyqwer 2021-04-29 17:26:07 +0800
• d2843560af [Bug修复]: 修复了删除操作日志时没有记录日志的bug,让部分权限狗清理作案痕迹时会留下马脚 ly 2021-04-29 17:18:16 +0800
• 0a6e493f95 新增示例（表格列拖拽） RuoYi 2021-04-27 17:12:31 +0800
• 0f17e5c433 日志注解兼容获取json类型的参数 RuoYi 2021-04-27 14:49:17 +0800
• 58db8d2646 Pre Merge pull request !286 from 企方网络/dev 企方网络 2021-04-27 01:11:22 +0800
• d4f43f1d6d update pom.xml. 企方网络 2021-04-27 01:10:34 +0800
• 7648eab19f 移除多余的if else Hacker 2021-04-25 16:49:40 +0800
• 62905caeb5 Merge remote-tracking branch 'origin/activity' into activity dy 2021-04-25 15:27:45 +0800
• fbeb9fdee3 前段奖品修改地址 xu0625 2021-04-25 15:12:31 +0800
• 7de96d48b1 代码回滚 dy 2021-04-25 15:01:26 +0800
• 99ab1aaab7 Merge remote-tracking branch 'origin/master' into activity dy 2021-04-25 14:48:14 +0800
• 6fbf1f81f9 Merge branch 'content-center-int' zkr_liushenlu 2021-04-25 14:44:02 +0800
• c38d7c50ec Merge remote-tracking branch 'origin/master' into activity dy 2021-04-25 14:39:31 +0800
• a98077a206 文章模版 zkr_liushenlu 2021-04-25 09:44:47 +0800
• 6fc057f2c9 Merge remote-tracking branch 'origin/activity' into activity dy 2021-04-25 09:27:30 +0800
• c932e42a62 复选框校验 dy 2021-04-25 09:27:16 +0800
• 8803b7e844 抽奖活动前端应用，获取openid；查询抽奖次数 wanghuayue 2021-04-23 19:49:29 +0800
• ec73e474ce 后端-活动管理页面图片必填校验 dy 2021-04-23 14:34:08 +0800
• 1363e520dc 后端-活动管理页面样式调整 dy 2021-04-23 09:51:48 +0800
• 3ffaa4ee62 后端-活动管理页面样式调整 dy 2021-04-22 16:46:12 +0800
• a217a3ffa5 后端-活动管理页面校验修改 dy 2021-04-22 15:38:38 +0800
• aa43cb582c 文章模版 zkr_liushenlu 2021-04-22 15:15:51 +0800
• 6bf8aca3ac 后端-活动管理页面校验修改 dy 2021-04-22 15:01:51 +0800
• 5fa29fd7c9 后端-活动管理页面校验修改 dy 2021-04-22 14:59:59 +0800
• d48d3b23ba 后端-活动管理页面567步自适应高度 dy 2021-04-22 11:28:51 +0800
• 84e09d006a 文章模版 zkr_liushenlu 2021-04-22 10:37:44 +0800
• eed44beb79 Merge remote-tracking branch 'origin/activity' into activity dy 2021-04-21 17:36:10 +0800
• 1730b61417 后端-活动管理页面字段校验 dy 2021-04-21 17:35:58 +0800
• d0401944ea 修复表单向导插件有滚动条时底部工具栏无法固定问题 Ricky 2021-04-21 17:35:40 +0800
• 362c1385e8 后端-活动管理页面字段校验 dy 2021-04-21 17:32:26 +0800
• 6081cc598b 后端-活动管理页面字段对齐 dy 2021-04-21 17:29:38 +0800
• 3eab532cb1 Merge remote-tracking branch 'origin/activity' into activity_xlh xu0625 2021-04-21 17:22:43 +0800
• 96b47d2730 活动娃娃机修改 xu0625 2021-04-21 17:22:23 +0800
• e8a9bfbe85 创建文章 zkr_liushenlu 2021-04-21 17:18:09 +0800
• d7922064e6 后端-活动管理必填校验 dy 2021-04-21 16:58:37 +0800
• 404bfa5400 后端-活动管理必填校验 dy 2021-04-21 16:53:12 +0800
• 3fd3c9226b 添加协议提示 xu0625 2021-04-21 16:37:49 +0800
• a72407644e 后端-第四步页面对齐 dy 2021-04-21 15:24:39 +0800
• f8a8488b83 后端-第三步页面对齐 dy 2021-04-21 15:14:44 +0800
• 04b87d7ac5 页面字体颜色修改 dy 2021-04-21 14:53:43 +0800
• c7c4aa29be 创建文章 zkr_liushenlu 2021-04-21 14:51:28 +0800
• f1220707f9 Merge remote-tracking branch 'origin/activity' into activity dy 2021-04-21 14:47:30 +0800
• 8e7280b07e 抽奖奖品修改页面添加图片 dy 2021-04-21 14:47:14 +0800
• e5a574db86 新增娃娃机抽奖记录查询播报展示 xu0625 2021-04-21 14:35:13 +0800
• 59e68e4eb7 新增页面收集信息页保存 xu0625 2021-04-21 14:33:07 +0800
• 45bdc57987 新增二维码页 xu0625 2021-04-21 14:32:14 +0800
• 4154f86d5c 新增抽将记录查询播报展示 xu0625 2021-04-21 14:31:05 +0800
• bffdf6cd6c 娃娃机活动规则添加滚动条 dy 2021-04-21 09:40:29 +0800
• 322c48882e 优化ExcelUtil空值处理 Ricky 2021-04-21 09:36:21 +0800
• 0b6ca60b53 前端活动流转路径修改 dy 2021-04-21 09:32:44 +0800
• a4ac3fdff3 前端活动流转路径修改 dy 2021-04-20 13:39:41 +0800
• d9a57ead5b 后台编辑添加活动规则描述 dy 2021-04-20 11:21:53 +0800
• b82556fe94 后台编辑添加活动规则描述 dy 2021-04-20 10:00:52 +0800
• df4fffd3f9 发放抽奖次数编写 todo 逻辑完善 修改活动展示页按钮2效果 dy 2021-04-20 09:34:35 +0800
• 74f3520693 修正模板字符编码 RuoYi 2021-04-18 12:30:14 +0800
• ec7f306a45 升级mybatis到最新版3.5.6 阻止远程代码执行漏洞 RuoYi 2021-04-18 12:28:49 +0800
• 059d976718 优化：使用nginx代理时，会获取到多个ip，取第一个真实ip 刘志平 2021-04-16 16:53:50 +0800
• 940e2c3528 新增娃娃机模块 xu0625 2021-04-16 16:25:09 +0800
• dbd1e95149 Merge remote-tracking branch 'origin/activity' into activity_xlh xu0625 2021-04-16 16:04:06 +0800
• f2478c815f 抽奖活动管理 xu0625 2021-04-16 16:02:30 +0800
• 2940be4e0b 删除无用mapper zkr_liushenlu 2021-04-16 14:41:54 +0800
• 4123f31ae3 调整空格 fangchengyan 2021-04-16 10:55:53 +0800
• 5c24ff0148 清除用户登录的错误次数 fangchengyan 2021-04-16 10:44:05 +0800
• d8ccbb2733 Merge remote-tracking branch 'origin/activity' into activity dy 2021-04-16 09:10:07 +0800
• 1f1a19a16d 前端活动欢迎页修改 dy 2021-04-16 09:09:44 +0800
• 22c215cc97 Merge remote-tracking branch 'origin/activity' into activity wanghuayue 2021-04-15 20:04:25 +0800
• 54202e8a8c 抽奖活动前端应用，抽奖主逻辑整合 wanghuayue 2021-04-15 20:01:42 +0800
• 87ada3cbe7 抽奖活动管理页面前端开发 xu0625 2021-04-15 16:59:29 +0800
• 3746c7d3de 活动管理-删除无用代码 dy 2021-04-15 15:32:28 +0800