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

• d3c93b0aef 修复虚拟订单逻辑 huangdeliang 2021-02-03 18:55:52 +0800
• 2cf5268f16 !56 修复菜品重量展示 Merge pull request !56 from 德仔/develop 德仔 2021-02-03 17:42:53 +0800
• 8effa650d8 Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-02-03 17:28:57 +0800
• a9cde613d9 修改通俗计量方式 huangdeliang 2021-02-03 17:28:45 +0800
• 7f666822ce 表单修改 及模板管理 查询^^ zgqahah 2021-02-03 15:48:07 +0800
• f00b46b35b 学期计划添加设置按钮 sk1551 2021-02-03 15:08:39 +0800
• f9faccae3a 表单修改 及模板管理 增加实现^^ zgqahah 2021-02-03 11:17:14 +0800
• 9ea96aee89 表单修改 及模板管理 zgqahah 2021-02-03 09:20:48 +0800
• 2e3f53f2ea !55 客户健康信息修改 Merge pull request !55 from 德仔/xzj 德仔 2021-02-02 20:31:56 +0800
• b89225bc6a 客户健康信息修改 xiezhijun 2021-02-02 20:29:53 +0800
• baeed2e8d3 修复角色管理-编辑角色-功能权限显示异常 RuoYi 2021-02-02 16:25:37 +0800
• 4c4b8d1781 表单修改 及模板管理 zgqahah 2021-02-02 14:34:08 +0800
• 851802861f !54 客户档案的合同添加、复制健康调查链接 Merge pull request !54 from 德仔/xzj 德仔 2021-02-01 19:45:14 +0800
• e3d8a9fa12 客户档案的合同添加、复制健康调查链接 xiezhijun 2021-02-01 19:13:41 +0800
• a9092c1325 幼儿园一日流程评估计划 zhanglipeng 2021-02-01 17:14:06 +0800
• 973606f319 图片上传 huangdeliang 2021-02-01 16:11:13 +0800
• 9c8d3bffd4 图片上传 huangdeliang 2021-02-01 16:05:23 +0800
• efdbd99e3d 图片上传 huangdeliang 2021-02-01 16:03:52 +0800
• 05ec53e7ec 图片上传 huangdeliang 2021-02-01 15:57:45 +0800
• 4e9621fdf6 图片上传 huangdeliang 2021-02-01 15:56:31 +0800
• baf8f5973c 图片上传 huangdeliang 2021-02-01 15:55:08 +0800
• 3062b00b22 图片上传 huangdeliang 2021-02-01 15:40:26 +0800
• d7ba79f26f 图片上传 huangdeliang 2021-02-01 15:38:07 +0800
• ed19eb7099 图片上传 huangdeliang 2021-02-01 15:31:51 +0800
• efc8b543c2 图片上传 huangdeliang 2021-02-01 15:30:10 +0800
• 2f97afd90b 图片上传 huangdeliang 2021-02-01 15:25:27 +0800
• eceadabfaa 图片上传 huangdeliang 2021-02-01 15:23:00 +0800
• 58d15d0d60 清理accessToken huangdeliang 2021-02-01 15:14:03 +0800
• 9e02b450e7 清理accessToken huangdeliang 2021-02-01 15:10:34 +0800
• f41eccf69c 清理accessToken huangdeliang 2021-02-01 15:06:57 +0800
• 7277179aa3 切换账号 huangdeliang 2021-02-01 15:00:23 +0800
• ff2ec24ee0 修复文件路径 huangdeliang 2021-02-01 13:57:43 +0800
• 887bbe6796 修复文件路径 huangdeliang 2021-02-01 13:52:00 +0800
• c53d40777a 修复文件路径 huangdeliang 2021-02-01 13:49:59 +0800
• e35fedef8b 修复文件路径 huangdeliang 2021-02-01 13:44:38 +0800
• 7093e9a9af 打印错误信息 huangdeliang 2021-02-01 13:34:39 +0800
• 7bee783f8c 上传文件 huangdeliang 2021-02-01 12:53:22 +0800
• b2725c3bbc 上传文件 huangdeliang 2021-02-01 12:45:29 +0800
• 295ad5b254 测试redis huangdeliang 2021-02-01 11:44:08 +0800
• c0a4778088 图片上传 huangdeliang 2021-02-01 11:38:02 +0800
• ea1256d059 !53 修复样式 Merge pull request !53 from 德仔/develop 德仔 2021-02-01 11:15:19 +0800
• a034d70636 修复样式 huangdeliang 2021-02-01 11:13:47 +0800
• f3a4fa40a8 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-01 10:10:22 +0800
• 418ab6b3a5 Merge branches 'develop' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-01 10:10:05 +0800
• 3f8e49588d 幼儿园一日流程评估计划 zhanglipeng 2021-02-01 09:49:23 +0800
• 9a8ee1e067 幼儿园一日流程评估计划 zhanglipeng 2021-02-01 09:47:08 +0800
• 91870bb4a2 !52 公众号开发 Merge pull request !52 from 德仔/develop 德仔 2021-02-01 09:22:19 +0800
• 90030b76f6 修改脚本 huangdeliang 2021-02-01 09:20:28 +0800
• 200e222aed 修改测试公众号 huangdeliang 2021-02-01 09:15:52 +0800
• f067b96170 !51 客户档案的体征、合同展示 Merge pull request !51 from 德仔/xzj 德仔 2021-01-30 19:41:56 +0800
• 9470aa6b5e 客户档案的体征、合同展示 xiezhijun 2021-01-30 19:26:56 +0800
• c186a4c5fd 修改测试公众号 huangdeliang 2021-01-30 18:19:27 +0800
• 244585a1a9 修改测试公众号 huangdeliang 2021-01-30 17:59:24 +0800
• 7095fdb634 修复jsonfield huangdeliang 2021-01-30 16:57:14 +0800
• 0ccc1012eb 测试git提交 mistic4396 2021-01-30 16:55:35 +0800
• 715311851d 修复jsonfield huangdeliang 2021-01-30 16:48:07 +0800
• ebb37a4810 修复jsonfield huangdeliang 2021-01-30 16:36:36 +0800
• 6c98e89337 Merge branch 'master' of gitee.com:darlk/ShengTangManage huangdeliang 2021-01-30 16:31:32 +0800
• 85e960c4ab 公众号开发 huangdeliang 2021-01-30 16:28:12 +0800
• 92bbc290c9 关联关系表的模板 mistic4396 2021-01-30 16:25:26 +0800
• e83d4754cb 小班禁止添加备课&学校显示截至日期 sk1551 2021-01-30 15:12:56 +0800
• 1c58b13bcf !50 亚健康合同修改 Merge pull request !50 from 德仔/xzj 德仔 2021-01-30 09:25:57 +0800
• 128fb0dd4f 视频优化 sk1551 2021-01-30 09:11:45 +0800
• 41fa6526c0 Merge branch 'master' of D:\播智教育\2020\benyi with conflicts. sk1551 2021-01-30 09:04:39 +0800
• ef261ff833 公众号开发 huangdeliang 2021-01-29 20:03:23 +0800
• e7abaaaaf8 亚健康合同修改 xiezhijun 2021-01-29 18:52:57 +0800
• 54db0ba24a 亚健康合同 xiezhijun 2021-01-29 18:38:14 +0800
• bccd850ae6 视频-七牛 zhanglipeng 2021-01-29 17:42:09 +0800
• 2fb4395eb7 修改参数 huangdeliang 2021-01-29 17:32:50 +0800
• 10f051701f 修改参数 huangdeliang 2021-01-29 17:01:18 +0800
• 9046cc120d 微信接口完善 huangdeliang 2021-01-29 16:30:17 +0800
• 6f5e72fb33 微信接口 huangdeliang 2021-01-29 16:07:47 +0800
• 611695463a 视频-本地资源 zhanglipeng 2021-01-29 15:34:39 +0800
• 4fbb01b54e 下载文件-还原 zhanglipeng 2021-01-29 15:12:42 +0800
• e1cff320bd 修复客户名字错误 huangdeliang 2021-01-29 14:45:42 +0800
• 3c7e7a0f00 修复健康评估弹窗 huangdeliang 2021-01-29 13:56:53 +0800
• f7db1bcb1b 优化文件下载 sk1551 2021-01-29 13:46:31 +0800
• 399fd8f1b4 下载文件 zhanglipeng 2021-01-29 13:10:10 +0800
• 85900682b8 下载文件 zhanglipeng 2021-01-29 12:55:18 +0800
• b18f274121 隐藏未提交状态下的审批按钮 sk1551 2021-01-29 12:40:51 +0800
• 459d55913e 修复权限 huangdeliang 2021-01-29 10:09:32 +0800
• a9b52b6b94 Merge branch 'master' of gitee.com:darlk/ShengTangManage huangdeliang 2021-01-29 09:20:53 +0800
• 62e72a1ffb !49 亚健康合同 Merge pull request !49 from 德仔/xzj 德仔 2021-01-29 08:32:00 +0800
• ffa2544215 亚健康合同 xiezhijun 2021-01-28 20:20:10 +0800
• e1d9d96244 优化代码 huangdeliang 2021-01-28 19:38:51 +0800
• 73b36a1a8b 合并代码 huangdeliang 2021-01-28 15:59:56 +0800
• c4458be248 Merge branch 'master' of gitee.com:darlk/ShengTangManage huangdeliang 2021-01-28 15:54:24 +0800
• dad428d90c 暂存 huangdeliang 2021-01-28 15:14:38 +0800
• 0479cfe4ae !48 客户体征相关 Merge pull request !48 from 德仔/xzj 德仔 2021-01-28 09:29:37 +0800
• badf491694 客户体征相关 xiezhijun 2021-01-27 18:54:05 +0800
• 40e64f0427 富文本编辑器上传图片bug zhanglipeng 2021-01-27 16:52:46 +0800
• 018a0bd7f1 富文本编辑器bug sk1551 2021-01-28 16:43:32 +0800
• 00be3a9183 富文本编辑器上传图片bug zhanglipeng 2021-01-27 16:35:57 +0800
• dfc4572cd2 富文本编辑器上传图片bug zhanglipeng 2021-01-27 16:19:36 +0800
• fb5c2e5962 富文本编辑器上传图片bug zhanglipeng 2021-01-27 15:34:05 +0800
• 2236b55dd1 幼儿档案添加预览和打印 sk1551 2021-01-27 11:35:56 +0800
• 4b2de6accd !47 客户健康优化修改 Merge pull request !47 from 德仔/xzj 德仔 2021-01-26 21:02:54 +0800
• 9c899e344e 客户健康优化修改 xiezhijun 2021-01-26 20:42:59 +0800
• 18cab18fbe 新增园历-教师参与 zhanglipeng 2021-01-26 17:03:24 +0800
• dc76ce3105 考勤和统计bug zhanglipeng 2021-01-26 16:16:38 +0800