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

• 066e34a9e8 !108 修复食谱计划获取id错误 Merge pull request !108 from 德仔/develop 德仔 2021-03-08 18:53:04 +0800
• bddc3c7f85 修复食谱计划获取id错误 huangdeliang 2021-03-08 18:51:40 +0800
• 728b93cbdc Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-08 18:00:43 +0800
• 39ff2ed69c 案例文件打包下载 xiezhijun 2021-03-08 18:00:25 +0800
• 3279fd5f64 定时任务-停用当前日期大于幼儿园开通截止日期的园所 zhanglipeng 2021-03-08 16:36:33 +0800
• f61d6fd6f6 !107 另存为模板功能 Merge pull request !107 from 德仔/develop 德仔 2021-03-08 16:08:45 +0800
• 9ccd7ab17c 生成模板 huangdeliang 2021-03-08 16:05:49 +0800
• b3ce59ff25 另存为模板功能 huangdeliang 2021-03-08 16:04:36 +0800
• e445a84935 重构 删除不必要的代码 zgqahah 2021-03-08 15:56:03 +0800
• 3be9db91f4 !106 修复食谱生成bug Merge pull request !106 from 德仔/develop 德仔 2021-03-08 11:33:59 +0800
• ff89b9bf5e 修复食谱生成bug huangdeliang 2021-03-08 11:32:27 +0800
• 9239ee606c 禁止同一账号 同时登录 zhanglipeng 2021-03-08 10:57:41 +0800
• a51cb3ac5a ^^ zgqahah 2021-03-07 21:08:32 +0800
• 1ed87c6ea9 水印 zhanglipeng 2021-03-07 20:55:20 +0800
• fae53f3a88 Pre Merge pull request !168 from yaobillnh3/master yaobillnh3 2021-03-07 18:56:23 +0800
• 934dbd786a 值班人员新增岗位 yaowei 2021-03-07 18:56:19 +0800
• 73a1c8c4e2 培训视频禁止下载 sk1551 2021-03-07 16:24:27 +0800
• 976645fcd0 教研员考核完成情况 zhanglipeng 2021-03-07 11:30:12 +0800
• 4d57571548 Pre Merge pull request !175 from mistic4396/test1 mistic4396 2021-03-07 11:12:20 +0800
• f3df36d811 Pre Merge pull request !178 from lyflyy/master lyflyy 2021-03-07 11:12:20 +0800
• a97f6b841a Pre Merge pull request !181 from 蒋カイセキ/master 蒋カイセキ 2021-03-07 11:12:20 +0800
• 1b0638d738 Pre Merge pull request !183 from 狂盗一枝梅/kdyzm 狂盗一枝梅 2021-03-07 11:12:20 +0800
• a4cfeabd41 Pre Merge pull request !167 from lihy2021/N/A lihy2021 2021-03-07 11:12:19 +0800
• 6cb41ffe70 Pre Merge pull request !169 from lihy2021/N/A lihy2021 2021-03-07 11:12:19 +0800
• 8fcd5eedcf Pre Merge pull request !170 from lihy2021/N/A lihy2021 2021-03-07 11:12:19 +0800
• fa14364b82 Pre Merge pull request !171 from lihy2021/N/A lihy2021 2021-03-07 11:12:19 +0800
• cfdcf79011 Pre Merge pull request !174 from 刘必渠/master 刘必渠 2021-03-07 11:12:19 +0800
• 67738cb3bd Pre Merge pull request !141 from BecomeDream/N/A BecomeDream 2021-03-07 11:12:18 +0800
• ab2e188a6f Pre Merge pull request !151 from 水溶C100/N/A 水溶C100 2021-03-07 11:12:18 +0800
• e6a1e6fa8e Pre Merge pull request !154 from misaki/N/A misaki 2021-03-07 11:12:18 +0800
• 680ebd8370 Pre Merge pull request !155 from 郝斯文/master 郝斯文 2021-03-07 11:12:18 +0800
• c2a5b5f793 Pre Merge pull request !157 from Bombzj/master Bombzj 2021-03-07 11:12:18 +0800
• b9b74cbc14 Pre Merge pull request !158 from 渐行渐远/master 渐行渐远 2021-03-07 11:12:18 +0800
• 4a08e19aab Pre Merge pull request !108 from leo_锤子/N/A leo_锤子 2021-03-07 11:12:17 +0800
• ac852bb43b Pre Merge pull request !103 from HaoRan/N/A HaoRan 2021-03-07 11:12:16 +0800
• 467dd93a83 Pre Merge pull request !104 from 山茶树和葡萄树/master 山茶树和葡萄树 2021-03-07 11:12:16 +0800
• b1b6ac5c41 Pre Merge pull request !81 from 平凡/优化缓存字典数据的性能 平凡 2021-03-07 11:12:16 +0800
• 0faab0814e Pre Merge pull request !92 from FQ/master FQ 2021-03-07 11:12:16 +0800
• 6d5c8dee39 Pre Merge pull request !45 from TianYongwei/N/A TianYongwei 2021-03-07 11:12:15 +0800
• 76d24a74fd Pre Merge pull request !76 from abbfun/N/A abbfun 2021-03-07 11:12:15 +0800
• 1ed215fe97 Pre Merge pull request !78 from 金威正/N/A 金威正 2021-03-07 11:12:15 +0800
• 044c61aba2 Pre Merge pull request !26 from Live/N/A Live 2021-03-07 11:12:14 +0800
• cd3a53f8fd Pre Merge pull request !31 from ZZ/N/A ZZ 2021-03-07 11:12:14 +0800
• 7099da16ca Pre Merge pull request !36 from 严俊东/master 严俊东 2021-03-07 11:12:14 +0800
• 87f876e267 Pre Merge pull request !11 from 莫云赵/N/A 莫云赵 2021-03-07 11:12:13 +0800
• dfaf18dd7a Pre Merge pull request !13 from ZZ/N/A ZZ 2021-03-07 11:12:13 +0800
• d25ace4d11 Pre Merge pull request !7 from shenbururen/master shenbururen 2021-03-07 11:12:11 +0800
• 61432480c8 删除多余的代码 RuoYi 2021-03-07 11:06:47 +0800
• 78deee063d !180 富文本编辑组件支持只读 Merge pull request !180 from JOSWAY/master 若依 2021-03-07 10:44:04 +0800
• 4ad003649e !182 解决 Byte[] 类型 to string 死循环的问题 Merge pull request !182 from sproutcat/master 若依 2021-03-07 10:39:41 +0800
• 616f5a6aca !185 update ruoyi-ui/src/views/monitor/logininfor/index.vue. Merge pull request !185 from asher/N/A 若依 2021-03-07 10:39:30 +0800
• fea3ff7b2a !184 update ruoyi-ui/src/views/monitor/operlog/index.vue. Merge pull request !184 from asher/N/A 若依 2021-03-07 10:39:22 +0800
• c9a8264f1e !105 修复粘贴功能 Merge pull request !105 from 德仔/develop 德仔 2021-03-06 18:36:27 +0800
• 7bcae39c0f 修复粘贴功能 huangdeliang 2021-03-06 18:35:31 +0800
• f584f29685 !103 增加备注信息 Merge pull request !103 from 德仔/develop 德仔 2021-03-06 18:24:01 +0800
• ce8dad3c0f !104 案例修改、图片预览 Merge pull request !104 from 德仔/xzj 德仔 2021-03-06 18:18:57 +0800
• f217adec10 增加备注信息 huangdeliang 2021-03-06 18:17:25 +0800
• e35992d984 案例修改、图片预览 xiezhijun 2021-03-06 18:06:39 +0800
• 4046b91923 1 zgqahah 2021-03-06 18:01:11 +0800
• ed69d3d8b9 代码优化 yaowei 2021-03-06 17:43:14 +0800
• e23e3a3e00 承包商列表新需求适配 yaowei 2021-03-06 17:19:54 +0800
• 7f3ec8e9e4 承包商列表新需求适配 yaowei 2021-03-06 17:18:40 +0800
• edd5b5559d !102 修复订单 Merge pull request !102 from 德仔/develop 德仔 2021-03-06 14:51:47 +0800
• 01f5c98954 修复订单 huangdeliang 2021-03-06 14:50:36 +0800
• 2737f2db1f !101 修改标题 Merge pull request !101 from 德仔/develop 德仔 2021-03-06 14:25:03 +0800
• 5c3fc0ef9e 修改标题 huangdeliang 2021-03-06 14:24:04 +0800
• 9cdefdb81b !100 修复食谱展示页面 Merge pull request !100 from 德仔/develop 德仔 2021-03-06 14:19:21 +0800
• f82e87fe55 补充二维码 huangdeliang 2021-03-06 14:18:00 +0800
• d266eabe8b 修复食谱展示页面 huangdeliang 2021-03-06 14:14:25 +0800
• c23ccd288c !99 订单管理页面适配手机端 Merge pull request !99 from 德仔/develop 德仔 2021-03-06 11:35:40 +0800
• d7e5ae3732 订单管理页面适配手机端 huangdeliang 2021-03-06 11:34:15 +0800
• a96841ca9e !98 案例管理的文件下载 Merge pull request !98 from 德仔/xzj 德仔 2021-03-06 09:03:48 +0800
• f1adbb041f 案例管理的文件下载 xiezhijun 2021-03-06 00:15:27 +0800
• 0f96ebf0f2 Merge branch 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-05 22:10:07 +0800
• c507057f63 合并 xiezhijun 2021-03-05 20:17:35 +0800
• b4d5eabf32 案例管理 xiezhijun 2021-03-05 20:15:05 +0800
• 0c3bf7003d !97 修复分量估算错误 Merge pull request !97 from 德仔/develop 德仔 2021-03-05 19:07:06 +0800
• e08a5e24c6 修复分量估算错误 huangdeliang 2021-03-05 18:57:58 +0800
• e81cb62e51 更新颜色 huangdeliang 2021-03-05 17:44:28 +0800
• 526f7cdf64 !96 增加二维码功能 Merge pull request !96 from 德仔/develop 德仔 2021-03-05 17:20:23 +0800
• a50c6afa49 增加二维码功能 huangdeliang 2021-03-05 17:19:18 +0800
• 8cd948c730 !95 修复修改问题 Merge pull request !95 from 德仔/develop 德仔 2021-03-05 16:31:47 +0800
• 0574b0f494 限定使用评估的角色登录 sk1551 2021-03-05 16:30:30 +0800
• 17b7c04f6d 修复修改问题 huangdeliang 2021-03-05 16:30:14 +0800
• bea88507d3 !94 修改样式，添加字体修改 Merge pull request !94 from 德仔/develop 德仔 2021-03-05 15:45:59 +0800
• 4c654d8617 修改样式，添加字体修改 huangdeliang 2021-03-05 15:44:45 +0800
• 4f08bedf61 复制功能 huangdeliang 2021-03-05 14:32:47 +0800
• 7f01513e1c 补充客户维护过保日期 sk1551 2021-03-05 10:14:26 +0800
• a15e90171b Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-05 09:02:29 +0800
• 0d36574c50 注释代码 huangdeliang 2021-03-04 20:54:44 +0800
• 97790b817a Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-03-04 20:53:36 +0800
• 7672f44404 配置提交 xiezhijun 2021-03-04 20:52:06 +0800
• c31092783b 优化 zhanglipeng 2021-03-04 20:45:36 +0800
• a675d46dbd !93 修复菜品新增错误 Merge pull request !93 from 德仔/develop 德仔 2021-03-04 20:38:46 +0800
• 65f0f64b03 !92 案例管理，添加修改暂停优化，判断时间不能重叠 Merge pull request !92 from 德仔/xzj 德仔 2021-03-04 20:36:58 +0800
• 2a7c499b24 案例管理，添加修改暂停优化，判断时间不能重叠 xiezhijun 2021-03-04 18:35:06 +0800
• 8e3142553b 修复菜品新增错误 huangdeliang 2021-03-04 18:02:19 +0800
• f70b85a2ed !91 修复餐类锁定 Merge pull request !91 from 德仔/develop 德仔 2021-03-04 17:44:37 +0800
• 324b6344b7 修复餐类锁定 huangdeliang 2021-03-04 17:43:35 +0800
• 6b3fec702e 优化 zhanglipeng 2021-03-04 17:36:33 +0800