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

• e5ede2a77c Pre Merge pull request !228 from BJGC/master BJGC 2021-05-13 14:50:26 +0800
• 7765dcabd2 ab admin 2021-05-13 14:49:19 +0800
• e4c494d0e5 ab admin 2021-05-13 14:46:45 +0800
• 2a1d9d1c54 ab admin 2021-05-13 14:40:21 +0800
• ad068ed3ea !242 新增接口 Merge pull request !242 from 德仔/develop 德仔 2021-05-12 19:19:37 +0800
• 7b16561591 新增接口 huangdeliang 2021-05-12 19:18:05 +0800
• 38bf3720e4 基地管理之制度建设上传文件 sk1551 2021-05-12 17:05:13 +0800
• f92ba36122 Pre Merge pull request !227 from kkk140/master kkk140 2021-05-12 14:53:01 +0800
• b3667730f2 页面优化 kkk140 2021-05-12 14:52:57 +0800
• be237f611f 修改优化vue.index.vue.vm kkk140 2021-05-12 14:32:39 +0800
• 7e655829d6 update 配置优化到 application.yml 统一管理 疯狂的狮子li 2021-05-12 09:38:56 +0800
• 08fb0296f7 新增基地管理之制度建设 sk1551 2021-05-11 17:46:19 +0800
• 65d1c156fd Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-05-11 16:02:13 +0800
• e5fb063b57 微信食谱开发 huangdeliang 2021-05-11 16:00:04 +0800
• 99726be9ac 修正导入表权限标识 RuoYi 2021-05-11 14:26:20 +0800
• 32f333a00e 删除操作日志记录日志 RuoYi 2021-05-11 14:25:39 +0800
• be5c19b764 树级结构更新子节点使用replaceFirst RuoYi 2021-05-11 14:25:25 +0800
• dd384e4a31 上传媒体类型添加视频格式 RuoYi 2021-05-11 14:25:08 +0800
• 96274e3abc !241 去除@JsonIgnore注解，会导致get方法取不到值 Merge pull request !241 from 德仔/xzj 德仔 2021-05-11 14:24:57 +0800
• bdde195e2b !225 【bug修复】文件上传时出现java.nio.file.FileAlreadyExistsException Merge pull request !225 from CANYON/master 若依 2021-05-11 14:19:53 +0800
• 47d94b75ae 去除@JsonIgnore注解，会导致get方法取不到值 xiezhijun 2021-05-11 14:19:07 +0800
• 4eea399904 代码合并 xiezhijun 2021-05-11 11:25:31 +0800
• edea626f73 暂停查询计算服务到期时间、查询生成食谱计划优化，不再去掉 xiezhijun 2021-05-11 11:19:15 +0800
• 98ee348f2f !240 视频上传修改优化 Merge pull request !240 from 德仔/xzj 德仔 2021-05-10 20:49:30 +0800
• 776f8761ad 视频上传修改优化 xiezhijun 2021-05-10 18:42:13 +0800
• cf06e629f2 修改学员调用主持人权限 sk1551 2021-05-10 17:03:56 +0800
• 44e540642f !239 调整个人信息顺序 Merge pull request !239 from 德仔/develop 德仔 2021-05-10 14:51:52 +0800
• d736726b24 调整个人信息顺序 huangdeliang 2021-05-10 14:50:00 +0800
• 35fc4ed13d 提交主持人评审管理-主持人报名，学校审核，区级审核权限控制前后台代码--renkaicheng renkaicheng 2021-05-09 16:45:58 +0800
• 102f6a87f6 !238 视频接口优化，案例检索 Merge pull request !238 from 德仔/xzj 德仔 2021-05-08 20:20:55 +0800
• 8600f48740 视频接口优化，案例检索 xiezhijun 2021-05-08 19:09:32 +0800
• 041b483b1d 学员报名身份判断 sk1551 2021-05-08 16:13:44 +0800
• 14ea071306 修复文件上传时java.nio.file.FileAlreadyExistsException libin 2021-05-08 15:31:16 +0800
• a7259e6f3f update ruoyi-ui/src/components/Editor/index.vue. 百晓生 2021-05-08 14:56:01 +0800
• 65d07f3f88 学员报名权限优化 sk1551 2021-05-08 14:54:21 +0800
• 6f3ff16e3c !237 修改微信统计导出顺序固定 Merge pull request !237 from 德仔/develop 德仔 2021-05-08 10:57:13 +0800
• 2b6cc96016 修改微信统计导出顺序固定 huangdeliang 2021-05-08 10:56:09 +0800
• ff8450e708 学员报名各各状态优化 sk1551 2021-05-08 10:28:35 +0800
• cf764ae860 !236 视频列表优化 Merge pull request !236 from 德仔/xzj 德仔 2021-05-07 19:46:17 +0800
• dc05f20d78 !235 修复时间错乱 Merge pull request !235 from 德仔/develop 德仔 2021-05-07 19:45:12 +0800
• d474e823c3 合并 xiezhijun 2021-05-07 18:44:12 +0800
• 2033e4cb43 视频列表优化 xiezhijun 2021-05-07 18:37:53 +0800
• a5c1483076 !235 修复时间错乱 Merge pull request !235 from 德仔/develop 德仔 2021-05-07 17:46:57 +0800
• 6b784c3f1f 修复时间错乱 huangdeliang 2021-05-07 17:45:15 +0800
• f01c37102e 学员学校评审和区级评审优化 sk1551 2021-05-07 17:30:13 +0800
• 13d21550c8 !234 修复问题 Merge pull request !234 from 德仔/develop 德仔 2021-05-07 17:10:16 +0800
• bb88894068 修复问题 huangdeliang 2021-05-07 17:09:23 +0800
• 272d8c833a 修复问题 huangdeliang 2021-05-07 17:09:12 +0800
• 0225b91e92 !233 修改微信基础数据 Merge pull request !233 from 德仔/develop 德仔 2021-05-07 16:39:09 +0800
• c90be09e5a 修改拖为托 sk1551 2021-05-07 16:16:52 +0800
• b4595bc408 修改过期重新登录时间限制 sk1551 2021-05-07 16:11:30 +0800
• 8fe1a3eba6 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-05-07 14:54:16 +0800
• ca5e1bb5f1 修改微信基础数据 huangdeliang 2021-05-07 14:53:26 +0800
• c8e0c16bfe !232 视频上传页面优化 Merge pull request !232 from 德仔/xzj 德仔 2021-05-07 10:16:36 +0800
• 344800dcfe 视频上传页面优化 xiezhijun 2021-05-07 10:14:07 +0800
• 2458f59906 SysMenuServiceImpl.getRouteName路由名称替换非规范字符 木土 2021-05-07 08:09:05 +0800
• 4b42b721dd !231 提成优化，视频管理优化 Merge pull request !231 from 德仔/xzj 德仔 2021-05-06 21:54:49 +0800
• ed62562536 Pre Merge pull request !216 from 胡永/fix-ruoyiUi-components-Pagination-bug 胡永 2021-05-06 20:40:54 +0800
• 50034301ac 添加新群号：201396349 RuoYi 2021-05-06 20:40:25 +0800
• 85ed712c50 !222 update ruoyi-ui/src/assets/styles/element-ui.scss. Merge pull request !222 from leizhuogogo/N/A 若依 2021-05-06 20:39:36 +0800
• f67d682345 !221 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java. Merge pull request !221 from phper08/N/A 若依 2021-05-06 20:39:26 +0800
• 9f2b055dee 提成优化，视频管理优化 xiezhijun 2021-05-06 19:53:31 +0800
• 3f1427eef9 update ruoyi-ui/src/assets/styles/element-ui.scss. leizhuogogo 2021-05-06 17:50:28 +0800
• 6a5581faaa !230 提成优化，视频页面 Merge pull request !230 from 德仔/xzj 德仔 2021-05-06 17:11:19 +0800
• bf4a5f3b54 学员评审区分权限 学校和区级 sk1551 2021-05-06 17:10:25 +0800
• 79f1b9b23c 提成优化，视频页面 xiezhijun 2021-05-06 17:08:55 +0800
• 23bbc6ccc0 添加IDEA及编译路径过滤 zhangsc 2021-05-06 11:41:26 +0800
• d7934d6197 !229 视频后台管理，提成计算优化 Merge pull request !229 from 德仔/xzj 德仔 2021-05-05 19:47:34 +0800
• 7236ef518e 视频后台管理，提成计算优化 xiezhijun 2021-05-05 19:44:48 +0800
• 7d0f5e94ef update ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java. phper08 2021-05-03 13:18:33 +0800
• fc693c4980 学员评审优化 sk1551 2021-04-30 18:52:45 +0800
• aae8475eb2 视频获取优化 xiezhijun 2021-04-30 18:51:39 +0800
• d900fe84e6 !228 视频播放参数修改 Merge pull request !228 from 德仔/xzj 德仔 2021-04-30 17:23:52 +0800
• af72e645f1 视频播放参数修改 xiezhijun 2021-04-30 17:21:12 +0800
• 89bcc34e0f !227 视频功能 Merge pull request !227 from 德仔/xzj 德仔 2021-04-29 21:02:43 +0800
• 941f34d201 视频功能 xiezhijun 2021-04-29 21:01:21 +0800
• a7238b5b88 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-04-29 20:59:54 +0800
• 8e260f9d39 暂存 huangdeliang 2021-04-29 20:59:14 +0800
• 8cd676aace !226 视频功能 Merge pull request !226 from 德仔/xzj 德仔 2021-04-29 20:46:36 +0800
• 6eef8ae29e 视频功能 xiezhijun 2021-04-29 20:45:31 +0800
• 31b3b76efe 添加学员评审确认 sk1551 2021-04-29 18:09:52 +0800
• 03aa2533f2 一日流程评估结果园历展示 zhanglipeng 2021-04-29 17:14:43 +0800
• ec71568749 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-04-29 17:00:31 +0800
• 7aea0f67d5 整理小程序接口 huangdeliang 2021-04-29 16:58:01 +0800
• b1f6109d3d 添加学员选拔 sk1551 2021-04-29 16:54:05 +0800
• f1e8889a59 一日流程评估结果影响主班教师 zhanglipeng 2021-04-29 15:55:20 +0800
• 1979afa6f6 修改主持人报名 sk1551 2021-04-29 15:14:46 +0800
• 3478669604 !225 视频功能 视频功能 德仔 2021-04-29 13:35:42 +0800
• be67dc5890 视频功能 xiezhijun 2021-04-29 13:10:51 +0800
• 674245e060 添加学员区级审核 sk1551 2021-04-29 10:09:39 +0800
• 45b87e1a86 通过项目名称ruoyi.name来定义Redis前缀，用于区分项目缓存 = 2021-04-28 21:59:17 +0800
• 0f21d54c5e Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-04-28 20:48:24 +0800
• 90126a3d4c 阿里云视频点播功能 xiezhijun 2021-04-28 20:48:02 +0800
• df74ad69f0 提交主持人评审管理-学校审核，区级审核，结果确认前后台代码--renkaicheng renkaicheng 2021-04-28 20:40:10 +0800
• b7051b492b 添加学员学校审核 sk1551 2021-04-28 17:52:31 +0800
• 069c2914d3 优化学员报名 sk1551 2021-04-28 16:25:01 +0800
• fb9d35c753 !224 新增消息中心功能 Merge pull request !224 from 德仔/xzj 德仔 2021-04-28 13:35:36 +0800
• bab4569b43 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-04-27 19:49:05 +0800
• bbbc4f2753 新增消息中心功能 xiezhijun 2021-04-27 19:48:22 +0800
• 9e78675778 优化 zhanglipeng 2021-04-27 18:09:48 +0800