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

• f938a24df0 update ruoyi-ui/src/views/monitor/logininfor/index.vue. asher 2021-03-04 17:00:07 +0800
• 45fa686a64 update ruoyi-ui/src/views/monitor/operlog/index.vue. asher 2021-03-04 16:58:18 +0800
• 46bd587aef !90 新增替换功能，快速增加餐类菜品 Merge pull request !90 from 德仔/develop 德仔 2021-03-04 16:52:08 +0800
• bea29e310e 新增替换功能，快速增加餐类菜品 huangdeliang 2021-03-04 16:50:51 +0800
• 5d0d6e01f8 客户维护增加过保时间 sk1551 2021-03-04 16:34:40 +0800
• bced50b531 1 zgqahah 2021-03-04 11:55:24 +0800
• 7c0e216ed1 优化 zhanglipeng 2021-03-04 11:04:12 +0800
• e00a47d3aa 1 zgqahah 2021-03-04 10:21:12 +0800
• 39171fd12d !89 食谱计划优化 Merge pull request !89 from 德仔/xzj 德仔 2021-03-03 19:27:02 +0800
• 4880a16faa !88 添加备注，柱状图标线 Merge pull request !88 from 德仔/develop 德仔 2021-03-03 19:26:17 +0800
• 96a405a314 添加备注，柱状图标线 huangdeliang 2021-03-03 19:25:03 +0800
• a20ef83dc4 食谱计划优化 xiezhijun 2021-03-03 18:17:03 +0800
• 56f9776253 客户维护:表头点击排序&判断手机号是否存在 sk1551 2021-03-03 18:00:53 +0800
• 77148e9067 Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-03 16:44:24 +0800
• b8fad6218f 修复权限 huangdeliang 2021-03-03 16:43:58 +0800
• 4943af635f 合并主分支内容 xiezhijun 2021-03-03 16:19:02 +0800
• 97deafb62d 食谱计划生成优化 xiezhijun 2021-03-03 16:07:52 +0800
• cc629ac18f !87 添加回车功能 Merge pull request !87 from 德仔/develop 德仔 2021-03-03 14:39:30 +0800
• 333f930b8c 添加回车功能 huangdeliang 2021-03-03 14:36:21 +0800
• 6fc785acab !86 修复食材分量不正确问题 Merge pull request !86 from 德仔/develop 德仔 2021-03-03 14:21:50 +0800
• 7e97f8510f 修复食材分量不正确问题 huangdeliang 2021-03-03 14:20:55 +0800
• dc7102f6bb !85 订单相关优化、健康评估报告模板修改 Merge pull request !85 from 德仔/xzj 德仔 2021-03-03 13:59:43 +0800
• a64f316ef3 !84 修复创建模板问题 Merge pull request !84 from 德仔/develop 德仔 2021-03-03 13:53:45 +0800
• 0d8c3b4940 升级oshi到最新版本v5.6.0 RuoYi 2021-03-03 13:53:03 +0800
• 92081f7035 修复创建模板问题 huangdeliang 2021-03-03 13:46:20 +0800
• adaf694be8 增加承包商区块 yaowei 2021-03-02 23:59:09 +0800
• 07eb89c4e4 修复bug yaowei 2021-03-02 23:24:21 +0800
• a339c0d931 !83 调整删除错误 Merge pull request !83 from 德仔/develop 德仔 2021-03-02 19:23:30 +0800
• 297a97db9e 调整删除错误 huangdeliang 2021-03-02 19:22:26 +0800
• 14f7113765 修复暂停计划 huangdeliang 2021-03-02 18:56:31 +0800
• 0f47bb8bc9 添加暂停计划 huangdeliang 2021-03-02 18:56:19 +0800
• 29d5818874 订单相关优化、健康评估报告模板修改 xiezhijun 2021-03-02 17:39:25 +0800
• bbb3ea795f !82 调整权限标识 Merge pull request !82 from 德仔/develop 德仔 2021-03-02 15:35:31 +0800
• ecbc4705a2 调整权限标识 huangdeliang 2021-03-02 15:33:53 +0800
• b981e07d4e 客户关系初版 sk1551 2021-03-02 14:51:20 +0800
• 15fb31ff8a 修改sql文件 zhangxiaodong 2021-03-02 10:07:08 +0800
• 643b4344f1 增加测试项目 zhangxiaodong 2021-03-02 09:51:42 +0800
• 377e31560f bug修复 yaowei 2021-03-02 01:03:32 +0800
• b2feaff34a !81 食谱模板功能完成 Merge pull request !81 from 德仔/develop 德仔 2021-03-01 19:05:52 +0800
• 4dd7a6f643 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-03-01 19:04:14 +0800
• 3d20c30edc 食谱模板功能完成 huangdeliang 2021-03-01 19:04:01 +0800
• f92e07f1ed 订单优化、提成分为审核、未审核 xiezhijun 2021-03-01 19:00:01 +0800
• adba47fe6c 3.1下午需求修改 sk1551 2021-03-01 18:13:03 +0800
• e6ea4a0135 init TomChen 2021-03-01 18:01:40 +0800
• ae604ed87f 字典管理 zhanglipeng 2021-03-01 16:26:54 +0800
• 89bb38b42e 在一日流程评估计划中添加班级平均分数 sk1551 2021-03-01 15:26:07 +0800
• a8c53d99e3 【功能增强】代码生成器生成配置新增“主类目”上级菜单选项 kdyzm 2021-03-01 14:51:20 +0800
• d7eca5409c 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-03-01 13:54:58 +0800
• a9f19abe3d 教研员服务基层导入 zhanglipeng 2021-03-01 11:47:52 +0800
• b9e08fda2c 客户关系管理 zhanglipeng 2021-03-01 09:33:35 +0800
• a5cd0edaa5 一日评估详情页面 sk1551 2021-02-28 21:10:14 +0800
• 27a2cf4e13 教研员管理优化根据需求 zhanglipeng 2021-02-28 20:46:44 +0800
• 7539ec6b7f !80 串联功能 Merge pull request !80 from 德仔/develop 德仔 2021-02-27 20:19:20 +0800
• b827824a86 bug修复 yaowei 2021-02-27 20:18:16 +0800
• 2d2e68ae10 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-02-27 20:17:36 +0800
• 77d5d346b1 添加食谱模板 huangdeliang 2021-02-27 20:15:40 +0800
• 2ceefcf9a5 食谱计划修改 xiezhijun 2021-02-27 19:22:25 +0800
• 1f09d7893c 重点节假日值班 yaowei 2021-02-27 18:25:10 +0800
• a244a4a536 Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-27 16:58:41 +0800
• 1d7b7cd259 串联功能 huangdeliang 2021-02-27 16:57:45 +0800
• a1cb4861ea Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-27 16:55:46 +0800
• 5de80fd57f 健康评估报告 xiezhijun 2021-02-27 16:55:31 +0800
• 0d099ed1bc 修改字段类型 yaowei 2021-02-27 16:41:12 +0800
• 1a34c6c688 修改表字段类型 yaowei 2021-02-27 16:17:52 +0800
• d74b647b8e 重点节日值班 yaowei 2021-02-27 15:29:49 +0800
• df485e55d0 !79 解决接口权限 Merge pull request !79 from 德仔/develop 德仔 2021-02-26 20:46:29 +0800
• d803e13ca3 解决接口权限 huangdeliang 2021-02-26 20:45:30 +0800
• 227c15ba8d !78 修改接口token Merge pull request !78 from 德仔/develop 德仔 2021-02-26 20:28:59 +0800
• faa1df53e1 修改接口token huangdeliang 2021-02-26 20:27:38 +0800
• 02a67be4fe !77 食谱展示界面开发 Merge pull request !77 from 德仔/develop 德仔 2021-02-26 20:16:12 +0800
• 9e87e1c9e8 食谱展示界面开发 huangdeliang 2021-02-26 20:14:35 +0800
• 488a149ec3 健康体征报告 xiezhijun 2021-02-26 18:45:56 +0800
• 99213d18e5 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-02-26 17:30:27 +0800
• fc8bb90832 增加获取每月最大和最小日期 yaowei 2021-02-26 01:27:09 +0800
• 4667ae0df9 修复人员信息修改bug yaowei 2021-02-26 01:04:09 +0800
• 479d4bb641 修复人员信息修改bug yaowei 2021-02-26 01:01:18 +0800
• 763493bec3 Merge branch 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-25 20:22:48 +0800
• 912300838a 食谱计划优化，未修改完 xiezhijun 2021-02-25 19:05:14 +0800
• b65757c8bf 一日流程评估页面 sk1551 2021-02-25 17:53:31 +0800
• 2de4e1e845 !76 订单相关优化 Merge pull request !76 from 德仔/xzj 德仔 2021-02-25 17:43:27 +0800
• 204529f52e 订单相关优化 xiezhijun 2021-02-25 17:30:51 +0800
• 2724f5803f !75 用户管理 Merge pull request !75 from 德仔/develop 德仔 2021-02-25 09:15:04 +0800
• e352e2f8aa 用户管理 huangdeliang 2021-02-25 09:13:48 +0800
• a793e1dbee !74 进粉统计优化 Merge pull request !74 from 德仔/xzj 德仔 2021-02-25 09:02:30 +0800
• 4df7ab0665 进粉统计优化 xiezhijun 2021-02-24 23:51:21 +0800
• 4e0a72ac71 代码优化 yaowei 2021-02-24 23:48:45 +0800
• eebf5565ce 重大节假日 yaowei 2021-02-24 23:46:22 +0800
• f0a9a5c7f6 修改bug yaowei 2021-02-24 23:26:31 +0800
• 09f47ccfab 承包商站点信息 yaowei 2021-02-24 22:58:00 +0800
• fe20d020b1 !73 修改 Merge pull request !73 from 德仔/develop 德仔 2021-02-24 19:00:42 +0800
• d90ff968af 修改 huangdeliang 2021-02-24 18:59:18 +0800
• ad8ac9aa43 !72 订单系统修改 Merge pull request !72 from 德仔/develop 德仔 2021-02-24 18:56:34 +0800
• f1f8ddd4f3 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-02-24 18:31:50 +0800
• 12607455a0 Merge branch 'xzj' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-02-24 18:22:27 +0800
• 31088215b5 修改样式，修改逻辑 huangdeliang 2021-02-24 18:20:45 +0800
• bd70cd6566 订单新增优化 xiezhijun 2021-02-24 18:19:27 +0800
• 64e807f27b 添加新群号：186866453 RuoYi 2021-02-24 13:45:24 +0800
• 66957edce0 外食计算优化，异步更新热量加上延迟 xiezhijun 2021-02-24 10:52:56 +0800
• 13727e8d39 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-02-24 08:55:57 +0800
• 62e2d22d24 修改订单，添加假删字段 huangdeliang 2021-02-24 08:55:33 +0800