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

• 7d44e1650d ios日期不显示 周计划审核不显示主题 直接跳转到课程树折叠 zhanglipeng 2021-09-04 22:05:25 +08:00
• 9ae5edaa74 菜单&部门新增展开/折叠功能 RuoYi 2021-09-04 12:10:33 +08:00
• 14c6c796e8 新增暗色菜单风格主题 RuoYi 2021-09-04 12:09:55 +08:00
• f88a929c20 主题整合学期计划 修改月份后 子项数据无法变更 bug修复 zhanglipeng 2021-09-03 23:53:40 +08:00
• 5d72f9d224 修复保存配置主题颜色失效问题 RuoYi 2021-09-03 16:50:48 +08:00
• 9629c47c82 角色不能为空 zhanglipeng 2021-09-03 16:01:40 +08:00
• 10d8f3f1f6 主题整合学期计划审批bug zhanglipeng 2021-09-03 14:17:58 +08:00
• e49f0cebf1 自定义弹层溢出滚动样式 RuoYi 2021-09-03 13:27:03 +08:00
• 3167d0f93c 主题整合备课 table 栏内容换行 更整齐 zhanglipeng 2021-09-03 10:37:30 +08:00
• 6361e4efdc 定时任务支持在线生成cron表达式 RuoYi 2021-09-03 09:54:07 +08:00
• 753a4dd654 Pre Merge pull request !274 from kkk140/master kkk140 2021-09-03 01:40:16 +00:00
• cfa86bd4fe !308 代码生成: 导入表时查询 新创建表的优先排序在前面 Merge pull request !308 from xiaoshitou/N/A 若依 2021-09-03 01:39:40 +00:00
• db760b2136 Pre Merge pull request !308 from xiaoshitou/N/A xiaoshitou 2021-09-02 20:01:27 +00:00
• a56bc47a81 代码生成: 导入表时查询 新创建表的优先排序在前面 xiaoshitou 2021-09-02 20:01:25 +00:00
• d654ccb791 保存提示语修改 zhanglipeng 2021-09-02 18:10:47 +08:00
• 49652d78ba 周计划 zhanglipeng 2021-09-02 17:47:16 +08:00
• a59e0ed925 主题整合周计划审批 zhanglipeng 2021-09-02 16:47:28 +08:00
• 1b06fe8f9b Pre Merge pull request !307 from 疯狂的狮子Li/N/A 疯狂的狮子Li 2021-09-02 05:44:22 +00:00
• ff9fbd04a6 update 代码生成增加分页合理化参数 疯狂的狮子Li 2021-09-02 05:44:21 +00:00
• 9def2f5508 游戏数学备课 zhanglipeng 2021-09-02 11:54:40 +08:00
• ff222b6aec 主题整合计划优化 zhanglipeng 2021-09-02 11:37:09 +08:00
• a15bfdfb46 防止表格最后页最后项删除变成暂无数据 RuoYi 2021-09-02 10:55:10 +08:00
• ee823b8326 防止表格最后页最后项删除变成暂无数据 RuoYi 2021-09-02 10:19:04 +08:00
• 5b09d5b39d 主题整合月计划优化 table页能直接查看内容 zhanglipeng 2021-09-01 22:53:52 +08:00
• b08204e074 优化 zhanglipeng 2021-09-01 17:30:53 +08:00
• c6db9ffc32 周计划加入学习五大领域；主题整合学期计划审批优化； zhanglipeng 2021-09-01 17:11:43 +08:00
• c367f56630 bugfix checkUserNameUnique，checkPhoneUnique，checkEmailUnique 增加del_flag判断 linn 2021-09-01 14:43:38 +08:00
• de3b3746f4 周教学计划优化 打印优化 zhanglipeng 2021-09-01 11:25:15 +08:00
• 57178e72a4 !304 修改数据字典样式回显 Merge pull request !304 from 马小法/master 若依 2021-09-01 01:20:59 +00:00
• 0d74d2d6b0 周教学计划 优化 zhanglipeng 2021-08-31 22:56:36 +08:00
• 8ecd50f01c 优化 zhanglipeng 2021-08-31 18:18:51 +08:00
• 9e079060cf 周计划 优化 zhanglipeng 2021-08-31 18:12:06 +08:00
• a5f0561235 主题整合学期备课 能直接跳转到课本详情页 zhanglipeng 2021-08-31 12:03:48 +08:00
• 8ad3508e18 主题整合备课 能直接跳转到课本详情页 zhanglipeng 2021-08-31 12:00:54 +08:00
• 0c203f7cb3 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-08-30 18:00:39 +08:00
• 3746bed2cc 批量导入添加订单营养师、助理、售后更换记录 xiezhijun 2021-08-30 18:00:11 +08:00
• e536548b74 Pre Merge pull request !304 from 马小法/master 马小法 2021-08-30 09:00:28 +00:00
• 7422802a92 Pre Merge pull request !215 from soulCoke/master soulCoke 2021-08-30 09:00:21 +00:00
• b8317a562c !303 修改非管理员登录时，获取菜单报错sql Merge pull request !303 from Gold_Fish/master 若依 2021-08-30 08:59:55 +00:00
• 8040ad8c03 修改数据字典回显 马小法 2021-08-30 16:53:16 +08:00
• c628aa5be8 修改代码生成字典回显样式 马小法 2021-08-30 16:49:30 +08:00
• cc43e6b96f Pre Merge pull request !303 from Gold_Fish/master Gold_Fish 2021-08-30 02:45:39 +00:00
• b036e78d85 修改根据userId获取菜单sql Gold_Fish 2021-08-30 02:42:49 +00:00
• 4e8c6fb7c0 修复字典组件值为整形不显示问题 RuoYi 2021-08-29 15:57:01 +08:00
• 134835c870 验证码默认20s超时 RuoYi 2021-08-29 15:56:46 +08:00
• 5ade90debf !299 XssHttpServletRequestWrapper中增加available方法 Merge pull request !299 from Ming/master 若依 2021-08-29 07:36:57 +00:00
• cba5583991 Pre Merge pull request !299 from Ming/master Ming 2021-08-29 07:35:36 +00:00
• bb0aeb39e3 !298 修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题 Merge pull request !298 from wjtc8/N/A 若依 2021-08-29 07:35:06 +00:00
• 09ecef5aac !362 优化未打卡用户列表 Merge pull request !362 from 德仔/xzj 德仔 2021-08-27 10:33:34 +00:00
• 97434169c5 文本框size优化 zhanglipeng 2021-08-27 16:35:13 +08:00
• 4dcdd76704 幼儿档案 zhanglipeng 2021-08-27 16:22:36 +08:00
• 02c5ad0545 幼儿档案 zhanglipeng 2021-08-27 16:20:06 +08:00
• f2cb7cad79 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-08-27 14:03:19 +08:00
• 129eec1b21 优化未打卡用户列表 xiezhijun 2021-08-27 14:02:56 +08:00
• 7e0952478c 班级升级 zhanglipeng 2021-08-27 11:33:10 +08:00
• 6208d0489b 修改resultMap 与 pageHelper不兼容导致分页条目总数与实际不一致的BUG kingstudio 2021-08-27 00:14:52 +08:00
• b3804855a4 Pre Merge pull request !301 from kingstudio/master kingstudio 2021-08-26 15:15:14 +00:00
• b2ff9eb6e7 修改resultMap 与 pageHelper不兼容导致分页条目总数与实际不一致的BUG kingstudio 2021-08-26 23:12:47 +08:00
• f047ec7f3d 设置数据库时区，避免登录日志时间错误 air0001 2021-08-26 07:23:25 +00:00
• 84c0fbc0b2 !361 商务单加上销售 Merge pull request !361 from 德仔/xzj 德仔 2021-08-26 03:01:29 +00:00
• 1a6dae2800 商务单加上销售 xiezhijun 2021-08-26 11:00:02 +08:00
• dd93497c0d !360 商务单加上售中 Merge pull request !360 from 德仔/xzj 德仔 2021-08-26 02:19:35 +00:00
• 1c6bda9901 商务单加上售中 xiezhijun 2021-08-26 10:15:29 +08:00
• 78465d9eca 合并 xiezhijun 2021-08-25 18:22:07 +08:00
• b3c7d68705 修改打卡详情页面，支持前一天后一天翻页查看 xiezhijun 2021-08-25 18:19:55 +08:00
• 9618690d30 !359 新增电子秤接口 Merge pull request !359 from 德仔/develop 德仔 2021-08-25 10:16:50 +00:00
• a311f872f1 新增电子秤接口 huangdeliang 2021-08-25 18:07:12 +08:00
• e815da39cd !358 直播记录加上营养师、时间范围筛选，导出功能，进粉、导粉、直播时长统计 Merge pull request !358 from 德仔/xzj 德仔 2021-08-24 10:32:10 +00:00
• 8e0a05cc03 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-08-24 18:09:24 +08:00
• 38ba732152 直播记录加上营养师、时间范围筛选，导出功能，进粉、导粉、直播时长统计 xiezhijun 2021-08-24 18:09:07 +08:00
• 098c650655 update ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java. 增加available方法于XssHttpServletRequestWrapper Ming 2021-08-24 08:42:56 +00:00
• f07c9fd2eb Pre Merge pull request !298 from wjtc8/N/A wjtc8 2021-08-24 08:01:16 +00:00
• e52092c6d4 修改时检查用户数据权限范围 RuoYi 2021-08-24 16:00:39 +08:00
• 5527f6365b !357 新增电子秤接口 Merge pull request !357 from 德仔/develop 德仔 2021-08-24 06:41:32 +00:00
• 1ebe65aee2 新增电子秤接口 huangdeliang 2021-08-24 14:39:55 +08:00
• 89911e7caf 修复带utc日期格式 yyyy-MM-dd'T'HH:mm:ss.SSS 在safari浏览器中无法正确格式化的问题 wjtc8 2021-08-24 05:51:00 +00:00
• 0fc266fe80 定时任务对检查异常进行事务回滚 RuoYi 2021-08-24 11:12:11 +08:00
• 8aa976620c Pre Merge pull request !297 from CYLJ126/master CYLJ126 2021-08-24 02:43:49 +00:00
• c481af6c60 !356 提成明细加上服务时间范围查询、优化订单营养师助理售后绑定关系逻辑 Merge pull request !356 from 德仔/xzj 德仔 2021-08-24 02:25:14 +00:00
• ec4f96dc7c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-08-23 15:30:07 +08:00
• e80c11a27c 提成明细加上服务时间范围查询、优化订单营养师助理售后绑定关系逻辑 xiezhijun 2021-08-23 15:29:49 +08:00
• 2ace46d42b Pre Merge pull request !296 from hankaibo/master hankaibo 2021-08-23 04:51:26 +00:00
• b095b8b8d4 Merge branch 'master' of gitee.com:y_project/RuoYi-Vue into master hankaibo 2021-08-23 04:51:22 +00:00
• 40eabd39b9 !355 直播记录页面添加进粉记录 Merge pull request !355 from 德仔/xzj 德仔 2021-08-21 10:23:52 +00:00
• c99220e535 !354 修复小问题 Merge pull request !354 from 德仔/develop 德仔 2021-08-21 10:19:01 +00:00
• 9a86126668 修复小问题 huangdeliang 2021-08-21 18:10:59 +08:00
• d1ef19f08a 自定义可拖动弹窗高度指令 RuoYi 2021-08-20 17:57:44 +08:00
• e6e10308ff 自定义可拖动弹窗宽度指令 RuoYi 2021-08-20 17:45:25 +08:00
• a5a0da6cd2 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-08-20 15:58:09 +08:00
• ad3b5be706 直播记录页面添加进粉记录 xiezhijun 2021-08-20 15:57:53 +08:00
• 71aa96ced9 园历优化 zhanglipeng 2021-08-20 15:23:35 +08:00
• 22530d650d 权限说明 zhanglipeng 2021-08-20 13:33:47 +08:00
• cb5ee9c8a1 补充定时任务表字段注释 RuoYi 2021-08-20 11:04:15 +08:00
• cc88b0ea38 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue hankaibo 2021-08-19 23:01:39 +08:00
• 1e37f0430b 定时任务屏蔽ldap远程调用 RuoYi 2021-08-19 15:26:22 +08:00
• 295173258c !295 update 优化 使用权限工具 获取用户信息 Merge pull request !295 from 疯狂的狮子Li/update 若依 2021-08-19 06:55:13 +00:00
• d096d3a6f4 Pre Merge pull request !295 from 疯狂的狮子Li/update 疯狂的狮子Li 2021-08-19 06:49:41 +00:00
• fec90d0487 !294 update ruoyi-ui/src/layout/index.vue. Merge pull request !294 from aasdd/N/A 若依 2021-08-19 06:49:06 +00:00
• aead560227 update 优化 使用权限工具 获取用户信息 疯狂的狮子li 2021-08-19 11:13:59 +08:00
• 5a52f706df !353 调整oss Merge pull request !353 from 德仔/develop 德仔 2021-08-18 10:23:17 +00:00