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

• fdb13cdd26 redis增加 database选项 li_oxen 2020-12-19 09:51:24 +0800
• 2eb10804a8 Pre Merge pull request !143 from 三流小角色/dev 三流小角色 2020-12-18 17:41:39 +0800
• ea697bb97a 机构信息demo sanliu2015 2020-12-18 17:11:26 +0800
• 0734ea0ea4 修复 系统监控 -> 缓存监控-> 内存信息 图表数据错误 li_oxen 2020-12-18 16:04:24 +0800
• 2aca886ac2 !22 修复重复数据问题 Merge pull request !22 from 德仔/develop 德仔 2020-12-18 16:02:18 +0800
• ab12e4b38b 修复重复数据 huangdeliang 2020-12-18 16:00:10 +0800
• 0e021d2f83 优化 zhanglipeng 2020-12-18 15:57:30 +0800
• 4b6b3a5032 Merge remote-tracking branch 'upstream/master' into dev sanliu2015 2020-12-18 13:32:37 +0800
• f0c466554b 多环境打包修改 sanliu2015 2020-12-18 13:13:25 +0800
• c78d34f492 no commit message 哑巴 2020-12-18 00:16:04 +0800
• 06391ad3c3 no commit message 哑巴 2020-12-18 00:15:48 +0800
• 721ffaac62 解决找不到i18n中的key时可能会抛出的异常情况 BecomeDream 2020-12-17 22:05:21 +0800
• 53e8d7f5b2 测试环境修改 sanliu2015 2020-12-17 17:47:46 +0800
• 56fd60a4cf 园历展示增加幼儿考勤人数统计 zhanglipeng 2020-12-17 17:06:48 +0800
• 4a6a6079ef 当api接口需要授权给二个以上的 页面/权限 访问时可以在PreAuthorize注解中用$美元符号分割,如下 @PreAuthorize("@ss.hasPermi('system:user:query$system:user:edit')") 修改了PermissionService.java中的hasPermissions方法 -水溶C100 zhouwei 2020-12-17 16:05:32 +0800
• 6a1c88a6f9 系统首页左侧菜单title更改 sanliu2015 2020-12-17 15:46:27 +0800
• 7768d55ac7 多环境配置，idea启动请指定运行窗口指定active profile 为dev sanliu2015 2020-12-17 15:45:44 +0800
• 376b33c629 Merge remote-tracking branch 'origin/master' into master zhouwei 2020-12-17 15:39:53 +0800
• 6d2219aaff 当api接口需要授权给二个以上的 页面/权限 访问时可以在PreAuthorize注解中用$美元符号分割,如下 @PreAuthorize("@ss.hasPermi('system:user:query$system:user:edit')") zhouwei 2020-12-17 15:29:13 +0800
• ebe4d92d1f 优化 zhanglipeng 2020-12-17 15:28:13 +0800
• 71a29338dc 登录之后首页 sanliu2015 2020-12-17 14:59:34 +0800
• 60c3c455ee logo替换 sanliu2015 2020-12-17 13:27:50 +0800
• 47fa01fa1b 网页title sanliu2015 2020-12-17 13:11:20 +0800
• 998897f813 登录页面调整 sanliu2015 2020-12-17 13:09:55 +0800
• c86dc20743 移除path-to-regexp正则匹配插件 RuoYi 2020-12-17 12:05:29 +0800
• 1500405c41 Merge remote-tracking branch 'upstream/master' sanliu2015 2020-12-17 11:22:37 +0800
• b2e537e86b no commit message 哑巴 2020-12-16 22:31:19 +0800
• d1786f5327 新增食材管理 huangdeliang 2020-12-16 22:10:20 +0800
• 6f50440ba5 no commit message 哑巴 2020-12-16 22:02:43 +0800
• 9047045335 no commit message 哑巴 2020-12-16 22:02:25 +0800
• 7e235a91b4 no commit message 哑巴 2020-12-16 22:01:55 +0800
• 32b7353f64 no commit message 哑巴 2020-12-16 22:01:25 +0800
• ecc7a8be46 优化多级菜单之间切换无法缓存的问题 RuoYi 2020-12-16 20:57:48 +0800
• e709f82293 解决mysql建表时报Index column size too large. The maximum column size is 767 bytes. mysql建表时报Index column size too large. The maximum column size is 767 bytes. 解决办法： 在建表语句的后面加入：ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC; Live 2020-12-16 18:48:42 +0800
• 322753b315 Merge remote-tracking branch 'upstream/master' sanliu2015 2020-12-16 14:12:00 +0800
• e23ad20186 README RuoYi 2020-12-16 10:20:02 +0800
• 6cf2a8edeb 升级SpringBoot到最新版本2.2.12 提升启动速度 RuoYi 2020-12-16 10:05:53 +0800
• 27bf41b006 新增食材管理 huangdeliang 2020-12-15 21:11:45 +0800
• 67198aede9 README RuoYi 2020-12-15 10:06:12 +0800
• 4f33da2a3f 登录后push添加catch防止出现检查错误 RuoYi 2020-12-15 10:04:09 +0800
• a3fc7d7da7 数据库表 huangdeliang 2020-12-14 20:32:53 +0800
• 7483bd3ae9 新增食材表 huangdeliang 2020-12-14 20:14:19 +0800
• 0d4bec117f 修改幼儿生日必填bug sk1551 2020-12-14 18:06:29 +0800
• c961503631 入园体验 入学通知书 打印 zhanglipeng 2020-12-14 14:29:33 +0800
• 05e3bb6837 Merge remote-tracking branch 'upstream/master' sanliu2015 2020-12-14 09:23:41 +0800
• 8988d0b4ab 若依 3.3.0 v3.3.0 RuoYi 2020-12-14 09:02:10 +0800
• ceefa20aa2 调整代码生成页列宽 RuoYi 2020-12-13 16:05:49 +0800
• 89e1f2a53f 修改Set可能导致嵌套的问题 RuoYi 2020-12-13 15:01:03 +0800
• 6800a12014 !138 修改Set可能导致嵌套的问题 Merge pull request !138 from BecomeDream/N/A 若依 2020-12-13 14:54:17 +0800
• 9318d168eb Pre Merge pull request !138 from BecomeDream/N/A BecomeDream 2020-12-11 18:16:58 +0800
• e8f63b2994 修改Set可能导致嵌套的问题 BecomeDream 2020-12-11 18:16:57 +0800
• ed1e0ab156 !21 修改用户列表逻辑 Merge pull request !21 from 德仔/develop 德仔 2020-12-11 17:51:13 +0800
• 4494341d08 修改打卡记录单位 huangdeliang 2020-12-11 17:49:20 +0800
• b18a3774ac 修改打卡记录单位 huangdeliang 2020-12-11 17:47:14 +0800
• df1f33ddcc 幼儿收费 zhanglipeng 2020-12-11 17:35:51 +0800
• f7bdf4e05b Pre Merge pull request !137 from 〝走走停停/master 〝走走停停 2020-12-11 17:05:36 +0800
• 4256b14935 Pre Merge pull request !122 from 马仔小光/master 马仔小光 2020-12-11 17:05:34 +0800
• ecfe7006e2 代码生成预览支持高亮显示 RuoYi 2020-12-11 17:04:54 +0800
• d937d97f26 update ruoyi-ui/src/components/RightToolbar/index.vue. 对搜索、刷新加入显示控制 〝走走停停 2020-12-11 13:40:30 +0800
• 9e387dc447 去除用户手机邮箱部门必填验证 RuoYi 2020-12-11 13:26:14 +0800
• 231bbf6928 !135 增加日志记录过滤对象类型（解决多文件场景报错） Merge pull request !135 from geruishi/master 若依 2020-12-11 13:24:03 +0800
• e417fee67e 幼儿生日必填 sk1551 2020-12-11 09:56:16 +0800
• d6eac2dc8d 前端更新插件版本 RuoYi 2020-12-11 09:27:12 +0800
• b1a04377a1 更新用户列表查询逻辑 huangdeliang 2020-12-10 19:49:21 +0800
• 2fa26a8890 优化 zhanglipeng 2020-12-10 16:33:28 +0800
• 31d69d8ded 园所收费标准 zhanglipeng 2020-12-10 16:06:08 +0800
• 082f0046cc 代码生成添加类型为无符号数字类型支持 shoukaiseki 2020-12-10 14:12:25 +0800
• b368ad764f 升级core-js到最新版本3.8.1 RuoYi 2020-12-10 12:08:18 +0800
• e44c39114c update ruoyi-ui/src/main.js. 〝走走停停 2020-12-10 11:15:53 +0800
• ffd5f0ce5d 升级vue-router到最新版本3.4.9 RuoYi 2020-12-10 11:14:44 +0800
• 1efc043640 添加xy工具js 〝走走停停 2020-12-10 11:14:40 +0800
• a50beae599 代码生成预览提供滚动机制 RuoYi 2020-12-10 11:13:39 +0800
• 9fdec94440 !20 开放手机号校验 Merge pull request !20 from 德仔/develop 德仔 2020-12-10 10:01:54 +0800
• 0f3da466a0 放开电话号码校验 huangdeliang 2020-12-10 10:00:25 +0800
• 7e9007b559 !19 修改接口 Merge pull request !19 from 德仔/develop 德仔 2020-12-09 22:35:30 +0800
• cb96869cce 修改数据查询接口 huangdeliang 2020-12-09 22:34:20 +0800
• 3bd9c8654a !18 修改数据查询接口 Merge pull request !18 from 德仔/develop 德仔 2020-12-09 22:10:47 +0800
• f8010e8001 修改数据查询接口 huangdeliang 2020-12-09 22:09:07 +0800
• cf7f51a633 解决多文件上传Log报错 葛瑞士 2020-12-09 16:05:09 +0800
• bfe10b0b2b 优化姓名搜索 sk1551 2020-12-09 15:17:30 +0800
• 9d53143a9c 页面优化 zhanglipeng 2020-12-09 14:50:46 +0800
• 5b1d4d3fea 页面优化 zhanglipeng 2020-12-09 14:48:01 +0800
• 3ad81bc7c8 新增干部挂职经历 sk1551 2020-12-09 14:10:42 +0800
• c6e7c4960b 新增干部培训经历 sk1551 2020-12-09 13:42:58 +0800
• f504af1659 见习之星证书和详情 zhanglipeng 2020-12-09 11:23:39 +0800
• 904ded044d !17 港澳手机规则 Merge pull request !17 from 德仔/develop 德仔 2020-12-09 11:13:17 +0800
• f727a6d758 更新港澳手机号段 huangdeliang 2020-12-09 11:11:27 +0800
• be00bf75b3 优化 sk1551 2020-12-09 11:10:30 +0800
• d053b57d74 更新港澳手机号段 huangdeliang 2020-12-09 11:10:00 +0800
• c1219af9bf 增加干部学习经历 sk1551 2020-12-09 11:05:20 +0800
• 125963002c !16 更新港澳手机号规则 Merge pull request !16 from 德仔/develop 德仔 2020-12-09 10:50:59 +0800
• 1c643a761d 更新港澳手机号段 huangdeliang 2020-12-09 10:48:41 +0800
• 4d46f4c1b5 删除用户和角色解绑关联 RuoYi 2020-12-09 10:32:53 +0800
• a941c1b488 !134 修改 代码生成 预览无法左右滑动 Merge pull request !134 from 〝走走停停/master 若依 2020-12-09 10:27:34 +0800
• 33aec37b12 增加干部工作经历 sk1551 2020-12-09 09:53:35 +0800
• 1050af3d86 增加干部出入境情况 sk1551 2020-12-09 08:56:43 +0800
• 49d4ffe862 !15 开发同学页面接口 Merge pull request !15 from 德仔/develop 德仔 2020-12-08 20:51:13 +0800
• 2e3b440c42 开发同学页面接口 huangdeliang 2020-12-08 20:49:03 +0800
• d6b6151aea update ruoyi-ui/src/assets/styles/ruoyi.scss. 〝走走停停 2020-12-08 17:49:51 +0800
• 5d99f65619 Pre Merge pull request !133 from 〝走走停停/N/A 〝走走停停 2020-12-08 17:47:49 +0800