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

• 06d62ea4a0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-06-05 18:18:20 +0800
• ec68617f50 加上小程序获取视频分类的接口 xiezhijun 2021-06-05 18:18:00 +0800
• b32c2637dc !278 管理者视觉 Merge pull request !278 from 德仔/develop 德仔 2021-06-05 15:44:11 +0800
• f6d1151db2 管理者视觉 huangdeliang 2021-06-05 15:42:24 +0800
• e452f5a904 管理者视觉 huangdeliang 2021-06-05 15:38:10 +0800
• 486f2d4f86 !277 调整界面 Merge pull request !277 from 德仔/develop 德仔 2021-06-05 15:08:37 +0800
• ea422f63f9 调整界面 huangdeliang 2021-06-05 15:05:32 +0800
• 8426b96683 Pre Merge pull request !241 from ytzjf/master ytzjf 2021-06-04 19:16:31 +0800
• 137f475d8d Merge branch 'master' of gitee.com:y_project/RuoYi-Vue into master ytzjf 2021-06-04 19:16:31 +0800
• a47539b387 群体教师文件管理权限设置 sk1551 2021-06-04 14:25:59 +0800
• ddf981185d 群体教师文件管理登录设置部门id sk1551 2021-06-04 13:50:55 +0800
• 1f0b60311c !276 进粉统计导出修复 Merge pull request !276 from 德仔/develop 德仔 2021-06-04 11:58:47 +0800
• 422431c77d 进粉统计导出修复 huangdeliang 2021-06-04 11:57:17 +0800
• f6dc48e40f 通知公告增加点击公告标题显示公告详情，支持备注的修改 ytzj 2021-06-04 11:40:06 +0800
• 4796cab2b1 群体教师考核-批量下载 zhanglipeng 2021-06-03 22:54:53 +0800
• 22b9421b2c 群体教师考核 zhanglipeng 2021-06-03 22:05:37 +0800
• a8785aafa3 群体教师考核 zhanglipeng 2021-06-03 21:54:19 +0800
• 8e6ee3905e 群体教师考核 zhanglipeng 2021-06-03 21:42:38 +0800
• dd977d60c0 群体教师文件管理优化 sk1551 2021-06-03 21:36:37 +0800
• fd8b6bc9d9 群体教师文件管理优化 sk1551 2021-06-03 21:31:57 +0800
• edc2ae83af 群体教师考核 zhanglipeng 2021-06-03 21:18:37 +0800
• 2c0ef39fde 群体教师文件管理 sk1551 2021-06-03 21:05:28 +0800
• 4135544873 群体教师考核文件汇总 zhanglipeng 2021-06-03 20:50:30 +0800
• 486d215c1f !275 先关掉自启逻辑 Merge pull request !275 from 德仔/develop 德仔 2021-06-03 18:48:21 +0800
• 8a9a55ff8e 先关掉自启逻辑 huangdeliang 2021-06-03 18:47:17 +0800
• 3844894249 !274 调整逻辑 Merge pull request !274 from 德仔/develop 德仔 2021-06-03 18:32:37 +0800
• 672ca49a55 调整逻辑 huangdeliang 2021-06-03 18:31:22 +0800
• d106fc89c0 !273 接入客户信息 Merge pull request !273 from 德仔/develop 德仔 2021-06-03 17:45:58 +0800
• d495f47304 接入客户信息 huangdeliang 2021-06-03 17:37:59 +0800
• 334ea71637 群体教师考核文件管理 zhanglipeng 2021-06-03 17:29:21 +0800
• f682efe758 退出关闭ws huangdeliang 2021-06-03 14:26:02 +0800
• 13cb91cd92 调整 huangdeliang 2021-06-03 14:10:24 +0800
• b7446f8d0f 富文本工具栏配置视频 RuoYi 2021-06-03 13:26:09 +0800
• 19924cd184 修复关闭confirm提示框控制台报错问题 RuoYi 2021-06-03 13:24:29 +0800
• 41bca98a3c 公告颜色 zhanglipeng 2021-06-03 12:03:55 +0800
• 375934d3e9 一日流程评估评估完毕自动刷新list 一日流程跨月不能继续评估 zhanglipeng 2021-06-03 11:52:10 +0800
• a2cfdfcfea !272 调整ws连接时机 Merge pull request !272 from 德仔/develop 德仔 2021-06-03 11:26:06 +0800
• 6238dffef0 Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-06-03 11:24:37 +0800
• a3ea4edcf4 调整ws连接时机 huangdeliang 2021-06-03 11:24:29 +0800
• b5e639bd8f Pre Merge pull request !239 from ytzjf/master ytzjf 2021-06-03 11:00:28 +0800
• 0eadecdaf5 Merge branch 'master' of gitee.com:y_project/RuoYi-Vue into master ytzjf 2021-06-03 11:00:28 +0800
• 30b152a231 !271 完善交互 Merge pull request !271 from 德仔/develop 德仔 2021-06-03 10:50:36 +0800
• f2d4dc6c79 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 德仔 2021-06-03 10:50:24 +0800
• ea8276e6a0 完善交互 huangdeliang 2021-06-03 10:36:21 +0800
• b4c7fb50e3 !270 售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑 Merge pull request !270 from 德仔/xzj 德仔 2021-06-03 09:28:42 +0800
• 85470a1549 修复表单构建选择下拉选择控制台报错问题 RuoYi 2021-06-02 20:43:34 +0800
• 2a604c0548 !237 同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题 Merge pull request !237 from 老李/origin 若依 2021-06-02 20:40:09 +0800
• c43ca57dd4 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-06-02 18:19:26 +0800
• 0d7f9478fa 售中提成计算，售前推送提成计算，优化修改客户手机号时更改绑定对应的微信用户逻辑 xiezhijun 2021-06-02 18:19:01 +0800
• 54fe2e4b64 解决确认提示框点击取消浏览器控制台报错的问题 ytzj 2021-06-02 15:21:02 +0800
• 953d188f50 修改端口 huangdeliang 2021-06-02 14:13:03 +0800
• a4252af6ed 修复ws huangdeliang 2021-06-02 14:11:15 +0800
• cfe970bd45 开发ws链接 huangdeliang 2021-06-02 14:06:21 +0800
• b7f3c68eca 优化图片工具类读取文件 RuoYi 2021-06-02 11:45:40 +0800
• edd2981076 调整用户测试接口swagger注解 RuoYi 2021-06-02 11:45:30 +0800
• bd7474871d !269 加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致 Merge pull request !269 from 德仔/xzj 德仔 2021-06-01 21:03:31 +0800
• 7cb4122891 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-06-01 19:25:03 +0800
• 77a8668b5d 加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致 xiezhijun 2021-06-01 19:24:40 +0800
• 7d36193da2 !268 添加图片导出时设置目标天数 Merge pull request !268 from 德仔/develop 德仔 2021-06-01 15:01:57 +0800
• d7368a2e0e 添加图片导出时设置目标天数 huangdeliang 2021-06-01 14:59:05 +0800
• c46ed33273 !267 管理后台前端搭建 Merge pull request !267 from 德仔/develop 德仔 2021-05-31 19:44:45 +0800
• d86bdedf79 修复测试数据 huangdeliang 2021-05-31 19:39:30 +0800
• 5fa207749f !266 合同修改，去掉5.10条事项 Merge pull request !266 from 德仔/xzj 德仔 2021-05-31 19:35:34 +0800
• 0e08a1fef8 管理后台前端搭建 huangdeliang 2021-05-31 19:34:04 +0800
• 783fd6fe3b 合同修改，去掉5.10条事项 xiezhijun 2021-05-31 18:34:29 +0800
• c105a63c8b 添加bat脚本执行应用 RuoYi 2021-05-31 12:16:27 +0800
• 1c3020987c 修 sk1551 2021-05-31 11:55:39 +0800
• dc661d6d0d !265 调整界面 Merge pull request !265 from 德仔/develop 德仔 2021-05-31 10:53:33 +0800
• 7e3311ad64 调整界面 huangdeliang 2021-05-31 10:52:30 +0800
• 01fef0b9e1 同步菜单新增、修改界面“功能权限”maxlength为100（保持与数据库字段长度一致），避免因超过50后不能录入问题 xx2yy 2021-05-31 10:31:50 +0800
• 1b03f0b5bf Pre Merge pull request !236 from 老李/master 老李 2021-05-31 10:19:26 +0800
• 328ca27ad2 同步与数据库的最大允许长度，避免超出50后前端无法录入 mcli 2021-05-31 10:14:14 +0800
• 9574146693 Merge remote-tracking branch 'upstream/master' into master # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. mcli 2021-05-31 10:12:37 +0800
• ea3a1cfbe5 通知公告动态 zhanglipeng 2021-05-31 09:27:14 +0800
• 16b299e589 !264 食谱计划添加发送按钮 Merge pull request !264 from 德仔/develop 德仔 2021-05-29 16:24:16 +0800
• b31aafc6e4 食谱计划添加发送按钮 huangdeliang 2021-05-29 16:21:11 +0800
• 87e38a5366 !263 体验单也需要生成食谱计划 Merge pull request !263 from 德仔/develop 德仔 2021-05-29 11:42:03 +0800
• 455cc51f17 体验单也需要生成食谱计划 huangdeliang 2021-05-29 11:38:59 +0800
• 21d3cdc60d !262 修复翻页 Merge pull request !262 from 德仔/develop 德仔 2021-05-29 10:48:56 +0800
• 8d7417f77e 修复翻页 huangdeliang 2021-05-29 10:48:05 +0800
• d70b7164fe !261 提成优化，加上替换订单 Merge pull request !261 from 德仔/xzj 德仔 2021-05-29 09:28:25 +0800
• d48cecc923 提成优化，加上替换订单 xiezhijun 2021-05-28 18:32:20 +0800
• 0122c35553 提成优化，需要加上更换订单提成详情 xiezhijun 2021-05-28 00:46:21 +0800
• e333cb007e 提成明细需要加上替换的订单 xiezhijun 2021-05-27 20:03:43 +0800
• 836f328c09 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-05-27 17:48:57 +0800
• af9cfb40a4 优化参数&字典缓存操作 RuoYi 2021-05-27 17:38:44 +0800
• 6fa3bfe051 修复两处存在SQL注入漏洞问题 RuoYi 2021-05-27 17:38:27 +0800
• 01fd29f2ec Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-05-27 16:40:17 +0800
• e5def38565 暂存 huangdeliang 2021-05-27 16:35:09 +0800
• 4c7c70c623 !260 建客户档案时根据直播记录匹配营养师 Merge pull request !260 from 德仔/xzj 德仔 2021-05-27 09:18:36 +0800
• cf766cb817 建客户档案时根据直播记录匹配营养师 xiezhijun 2021-05-26 19:06:14 +0800
• 57dd7c3043 暂存 huangdeliang 2021-05-26 18:11:12 +0800
• 39ba721853 Pre Merge pull request !235 from lihy2021/N/A lihy2021 2021-05-26 11:31:39 +0800
• a9cee98667 修复 首页 启用缓存无效 修复 首页 启用缓存后报错：uplicate keys detected: '/index'. lihy2021 2021-05-26 11:31:38 +0800
• 678ad365ae 一日流程评估-二次评估 zhanglipeng 2021-05-26 10:19:55 +0800
• 92f4556d22 一日流程评估-二次评估 zhanglipeng 2021-05-25 18:23:11 +0800
• b249035da0 !259 修复接口 Merge pull request !259 from 德仔/develop 德仔 2021-05-25 10:28:08 +0800
• 2e6df9e862 修复接口 huangdeliang 2021-05-25 10:26:39 +0800
• 14e3f4b88b 修复接口 huangdeliang 2021-05-25 10:26:13 +0800
• 4137d96cee Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-05-25 10:20:33 +0800