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

• f6652e1a52 调整oss huangdeliang 2021-08-18 18:19:55 +08:00
• 44a5157e69 Pre Merge pull request !294 from aasdd/N/A aasdd 2021-08-18 09:29:23 +00:00
• 8133c60ab3 update ruoyi-ui/src/layout/index.vue. 删掉此处代码，使右边栏动画生效。现在是没有动画的 aasdd 2021-08-18 09:29:22 +00:00
• 60956ade72 Pre Merge pull request !293 from hankaibo/develop hankaibo 2021-08-18 07:04:39 +00:00
• 2211400ecc chore: 基于vue-cli的standard代码规范格式化代码 hankaibo 2021-08-18 14:51:51 +08:00
• 030f8446d5 新增生日薄方法 ken_lwq_admin 2021-08-18 13:43:56 +08:00
• f5786b2624 Pre Merge pull request !291 from 张芸溪/N/A 张芸溪 2021-08-17 13:03:01 +00:00
• 971f4799a1 测试 张芸溪 2021-08-17 13:03:00 +00:00
• 11d9b5ded1 !352 解决食谱日期天数连续问题 Merge pull request !352 from 德仔/xzj 德仔 2021-08-17 10:44:01 +00:00
• e80604bc24 !351 打卡记录跳转搜索 Merge pull request !351 from 德仔/develop 德仔 2021-08-17 10:42:05 +00:00
• 1af737fe87 打卡记录跳转搜索 huangdeliang 2021-08-17 18:41:05 +08:00
• bc6114b40b Pre Merge pull request !290 from aasdd/N/A aasdd 2021-08-17 10:07:38 +00:00
• 440a769b81 update ruoyi-ui/src/layout/index.vue. 删掉此处代码，使右边栏动画生效。现在是没有动画的 aasdd 2021-08-17 10:07:37 +00:00
• de56cd3eb1 !350 调整打卡记录页面 Merge pull request !350 from 德仔/develop 德仔 2021-08-17 07:18:28 +00:00
• 9594c9222c 调整打卡记录页面 huangdeliang 2021-08-17 15:17:22 +08:00
• 5c155f5f11 支持自定义注解实现接口限流 RuoYi 2021-08-17 14:08:18 +08:00
• af454ecf9a 解决食谱日期天数连续问题 xiezhijun 2021-08-16 18:42:25 +08:00
• 2f1f3bfb8b 备课 zhanglipeng 2021-08-16 16:44:36 +08:00
• 03cf98d3c9 优化异常信息 RuoYi 2021-08-16 16:25:25 +08:00
• 4dc846b99f Pre Merge pull request !273 from 〝走走停停/master 〝走走停停 2021-08-16 08:23:58 +00:00
• 6f51f729ba !289 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 Merge pull request !289 from wangzhaoqiang/master 若依 2021-08-16 08:23:27 +00:00
• 2d9b049852 Pre Merge pull request !289 from wangzhaoqiang/master wangzhaoqiang 2021-08-16 07:03:41 +00:00
• 57b159eb98 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 wangzhaoqiang 2021-08-16 14:48:34 +08:00
• d235b5367d 班级信息，多角色。 zhanglipeng 2021-08-16 11:27:25 +08:00
• 08da6834a5 !288 修正方法名单词拼写错误 Merge pull request !288 from 稚屿/N/A 若依 2021-08-16 02:36:36 +00:00
• 268468fb47 !287 更新到【默认首页使用keep-alive缓存】后报错 Merge pull request !287 from wangzhaoqiang/master 若依 2021-08-16 02:36:29 +00:00
• 392f7d55ed Pre Merge pull request !288 from 稚屿/N/A 稚屿 2021-08-15 10:26:06 +00:00
• 333e19339c 修正方法名单词拼写错误 稚屿 2021-08-15 10:26:05 +00:00
• 5e294546fe 主题整合优化 zhanglipeng 2021-08-15 10:31:16 +08:00
• 5a3e482c8f Pre Merge pull request !287 from wangzhaoqiang/master wangzhaoqiang 2021-08-14 12:19:50 +00:00
• 7b6ccd9b22 解决登录后浏览器后台Breadcrumb组件报错 wangzhaoqiang 2021-08-14 20:16:48 +08:00
• 249c2ef099 tree 优化 zhanglipeng 2021-08-14 16:33:46 +08:00
• 02d8f7b3d6 建议问卷导出Excel xiezhijun 2021-08-14 16:20:16 +08:00
• 5fcbf22493 !349 aa Merge pull request !349 from 德仔/develop 德仔 2021-08-14 06:30:12 +00:00
• bb3b2f9270 清理代码 huangdeliang 2021-08-14 14:29:23 +08:00
• 30da59b113 !348 打卡情况页面 Merge pull request !348 from 德仔/develop 德仔 2021-08-14 06:24:59 +00:00
• 21836594b2 打卡情况页面 huangdeliang 2021-08-14 14:23:47 +08:00
• 63acde300c !347 新增、编辑订单以及新建客户档案时，下拉选择营养师，自动选择助理和售后 Merge pull request !347 from 德仔/xzj 德仔 2021-08-13 10:57:37 +00:00
• 8e963814d8 新增、编辑订单以及新建客户档案时，下拉选择营养师，自动选择助理和售后 xiezhijun 2021-08-13 18:00:59 +08:00
• 0830c786e1 排序 zhanglipeng 2021-08-13 17:42:59 +08:00
• 5d6f134609 多图上传组件移除多余的api地址 RuoYi 2021-08-13 15:15:35 +08:00
• f02743bde5 代码生成主子表多选行数据 RuoYi 2021-08-13 14:50:35 +08:00
• e8318e9a1a 排序 zhanglipeng 2021-08-13 14:10:17 +08:00
• 1f629bebf4 Pre Merge pull request !286 from 蒋正午/master 蒋正午 2021-08-13 05:08:24 +00:00
• 0ffcce612b ttt 蒋正午 2021-08-13 05:07:16 +00:00
• 842933c23e ttt 蒋正午 2021-08-13 05:06:41 +00:00
• c25842381e 排序 zhanglipeng 2021-08-13 12:34:53 +08:00
• 8812229159 排序 zhanglipeng 2021-08-13 12:21:17 +08:00
• bdc5d70ed0 排序 zhanglipeng 2021-08-13 12:10:52 +08:00
• c3b2fe1689 排序 zhanglipeng 2021-08-13 12:04:39 +08:00
• f618f66c3d 排序 zhanglipeng 2021-08-13 11:59:46 +08:00
• 7e9cab51e5 排序 zhanglipeng 2021-08-13 11:29:31 +08:00
• 3003bb0f50 Excel注解图片导入兼容xls RuoYi 2021-08-13 10:56:35 +08:00
• 5139265d32 默认首页使用keep-alive缓存 RuoYi 2021-08-13 10:10:29 +08:00
• 8a67af6c26 !285 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误 Merge pull request !285 from 稚屿/N/A 若依 2021-08-13 01:55:58 +00:00
• 8e4802505e !284 添加SysConfigservice,SysDictTypeService的实现方法遗漏的@Override注解 Merge pull request !284 from Old丶x/master 若依 2021-08-13 01:55:52 +00:00
• 01b8208a76 Pre Merge pull request !285 from 稚屿/N/A 稚屿 2021-08-13 01:08:01 +00:00
• 8ee641c1bc 修复角色分配用户页面接收参数与传递参数类型不一致导致的错误 稚屿 2021-08-13 01:08:00 +00:00
• 4ae6832379 快乐+1消息发送 xiaoyuer 2021-08-12 23:10:28 +08:00
• a89cf3ce01 微型课程优化 zhanglipeng 2021-08-12 21:57:39 +08:00
• 4efdee0ea1 select 滚动条 zhanglipeng 2021-08-12 17:42:42 +08:00
• acde786489 Pre Merge pull request !284 from Old丶x/master Old丶x 2021-08-12 09:34:42 +00:00
• d242494a4c Pre Merge pull request !283 from Old丶x/master Old丶x 2021-08-12 09:32:07 +00:00
• 779508989f 添加加载字典数据,清空字典数据,重置字典数据方法上遗漏的@Override注解 mroldx 2021-08-12 17:30:31 +08:00
• d9e805a6a5 添加获取验证码方法上遗漏的@Override注解 mroldx 2021-08-12 17:19:56 +08:00
• 757b4824b7 角色说明 zhanglipeng 2021-08-12 16:17:34 +08:00
• 0424aadd48 !346 打卡通知 Merge pull request !346 from 德仔/develop 德仔 2021-08-12 01:41:16 +00:00
• 95d5f0f57c 打卡通知 huangdeliang 2021-08-12 09:39:56 +08:00
• 1f78c45009 Pre Merge pull request !282 from 乐心湖/master 乐心湖 2021-08-11 16:00:48 +00:00
• c7f4388739 update ruoyi-ui/src/components/ImageUpload/index.vue. 修复上传图片属性字段使用错误 乐心湖 2021-08-11 15:59:16 +00:00
• 257287192c 意见反馈 快乐+1修改 xiaoyuer 2021-08-11 23:46:26 +08:00
• 9950a93119 !345 打卡通知 Merge pull request !345 from 德仔/develop 德仔 2021-08-11 03:47:12 +00:00
• f66d22c4e0 打卡通知 huangdeliang 2021-08-11 11:46:27 +08:00
• 7be17ea89a Excel注解支持Image图片导入 RuoYi 2021-08-11 10:13:34 +08:00
• 1f07641d9b update bin RuoYi 2021-08-11 10:11:13 +08:00
• 622b0c684b Pre Merge pull request !254 from yuyulangqi/master yuyulangqi 2021-08-11 02:09:26 +00:00
• c0f4f805d0 !281 补全注册用户方法上遗漏的@Override注解 Merge pull request !281 from 稚屿/N/A 若依 2021-08-11 02:08:58 +00:00
• 4c5423a753 基础功能开发 xiaoyuer 2021-08-10 23:51:02 +08:00
• b180b1c2d8 角色说明 zhanglipeng 2021-08-10 15:42:37 +08:00
• 8d9c066011 角色说明 zhanglipeng 2021-08-10 15:23:47 +08:00
• 2379567ff5 架构搭建 xiaoyuer 2021-08-10 15:10:03 +08:00
• 3d03370943 角色说明 zhanglipeng 2021-08-10 15:08:18 +08:00
• 4935f7325d 优化 zhanglipeng 2021-08-09 20:37:07 +08:00
• 22fc4dcd02 多幼儿园后 不显示管理员问题 zhanglipeng 2021-08-09 18:49:45 +08:00
• e7dafbeb1e 删除用户，无法创建 优化 zhanglipeng 2021-08-09 18:02:04 +08:00
• 60204379de !344 调整接口 Merge pull request !344 from 德仔/develop 德仔 2021-08-09 08:39:31 +00:00
• 57927c78d6 调整接口 huangdeliang 2021-08-09 16:38:28 +08:00
• 09f04a3bb5 家庭教育 zhanglipeng 2021-08-09 10:02:23 +08:00
• a78ad78ea3 Pre Merge pull request !281 from 稚屿/N/A 稚屿 2021-08-08 14:08:53 +00:00
• b84224d7ba 补全注册用户方法上遗漏的@Override注解 稚屿 2021-08-08 14:08:52 +00:00
• 76377ef3da 改变项目打包方式 jy 2021-08-08 19:58:54 +08:00
• 98a143f1fe 添加新群号：101456076 RuoYi 2021-08-08 19:50:50 +08:00
• 3243428009 优化用户不能删除自己 RuoYi 2021-08-08 19:12:52 +08:00
• 7736097f6b 提取通用方法到基类控制器 RuoYi 2021-08-08 19:12:12 +08:00
• 8fd8f7a44c 家庭教育 zhanglipeng 2021-08-08 11:33:24 +08:00
• 3b0af39687 项目初始化 lpf 2021-08-08 11:26:33 +08:00
• 78eda58df7 项目初始化 lpf 2021-08-08 01:05:59 +08:00
• 39e59760a9 项目初始化 lpf 2021-08-08 01:03:25 +08:00
• d477905248 项目初始化 lpf 2021-08-08 00:24:09 +08:00
• dfb199b108 !343 调整接口 Merge pull request !343 from 德仔/develop 德仔 2021-08-06 10:34:51 +00:00