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

• 51a9c5c798 新增当天采购计划 huangdeliang 2021-03-24 17:16:49 +0800
• 23015d814c 健康报告下载名称修改，打卡相关接口优化 xiezhijun 2021-03-24 17:16:36 +0800
• 090e258bf9 显隐列初始默认隐藏列 RuoYi 2021-03-24 15:46:37 +0800
• 505fa06dc3 !192 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. Merge pull request !192 from 谢凯/N/A 若依 2021-03-24 15:32:24 +0800
• 6cf53bfacb !191 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. Merge pull request !191 from allworldg/N/A 若依 2021-03-24 15:31:51 +0800
• 12484d77b2 !166 修复忌口展示 Merge pull request !166 from 德仔/develop 德仔 2021-03-24 10:57:50 +0800
• c4d1cba225 修复忌口展示 huangdeliang 2021-03-24 10:55:31 +0800
• 127495e12d !165 浏览文件修改名字 Merge pull request !165 from 德仔/develop 德仔 2021-03-23 20:21:30 +0800
• 6ba8bd02b9 修改名字 huangdeliang 2021-03-23 20:20:40 +0800
• 4fddb4d7d5 !164 修改名字 Merge pull request !164 from 德仔/develop 德仔 2021-03-23 20:19:40 +0800
• 8cc48dd276 修改名字 huangdeliang 2021-03-23 20:18:47 +0800
• ec0b426ceb !163 新增忌口编写功能 Merge pull request !163 from 德仔/develop 德仔 2021-03-23 20:11:26 +0800
• 2ea3d01d6e 新增忌口编写功能 huangdeliang 2021-03-23 20:10:29 +0800
• ea25149d0b !162 打卡后台，小程序接口 Merge pull request !162 from 德仔/xzj 德仔 2021-03-23 18:48:39 +0800
• c2d6a3c3df Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-23 18:46:24 +0800
• 0ab35ed6c7 打卡后台，小程序接口 xiezhijun 2021-03-23 18:46:10 +0800
• b2f173c054 客户关系添加分配功能 sk1551 2021-03-23 17:20:14 +0800
• 6c7a0f197e !161 图片预览 Merge pull request !161 from 德仔/develop 德仔 2021-03-23 15:15:02 +0800
• 960a094649 图片预览 huangdeliang 2021-03-23 15:14:02 +0800
• af7c5f9588 !160 图片预览 Merge pull request !160 from 德仔/develop 德仔 2021-03-23 15:08:01 +0800
• 2159605a3b 图片预览 huangdeliang 2021-03-23 15:07:00 +0800
• f3d8ab4a96 !159 图片预览 Merge pull request !159 from 德仔/develop 德仔 2021-03-23 14:43:32 +0800
• 424b98ad57 图片预览 huangdeliang 2021-03-23 14:42:01 +0800
• 354e464ebb Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-23 11:34:29 +0800
• 7952bdb03e 微信打卡接口优化 xiezhijun 2021-03-23 11:34:17 +0800
• 726f4e6b9d !158 生成食谱并制作完成后不能直接改未审核 Merge pull request !158 from 德仔/develop 德仔 2021-03-23 11:03:44 +0800
• cdb93a1702 生成食谱并制作完成后不能直接改未审核 huangdeliang 2021-03-23 11:03:16 +0800
• 414bcd0939 !157 调整饼图 Merge pull request !157 from 德仔/develop 德仔 2021-03-23 10:08:16 +0800
• d91543ea5e 调整饼图 huangdeliang 2021-03-23 10:01:53 +0800
• f1386bb21d !156 图表宽度 Merge pull request !156 from 德仔/develop 德仔 2021-03-22 19:53:15 +0800
• 0e5eeac7d4 图表宽度 huangdeliang 2021-03-22 19:52:08 +0800
• 510769cc25 !155 修复删除&食谱展示 Merge pull request !155 from 德仔/develop 德仔 2021-03-22 19:45:34 +0800
• c536b20b63 修复删除&食谱展示 huangdeliang 2021-03-22 19:44:20 +0800
• 23bdf241e4 还原打卡记录SQL xiezhijun 2021-03-22 19:15:12 +0800
• 6d912988ac 调整食谱信息顺序 huangdeliang 2021-03-22 17:57:44 +0800
• 881dc3fcf0 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. 谢凯 2021-03-22 17:52:34 +0800
• d1af8341f6 !154 调整图表展示 Merge pull request !154 from 德仔/develop 德仔 2021-03-22 17:02:04 +0800
• 8328cbab3a 调整评估项顺序 huangdeliang 2021-03-22 17:00:39 +0800
• 5f84333c30 调整图表展示 huangdeliang 2021-03-22 16:58:19 +0800
• 4294ab57c7 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-22 15:52:21 +0800
• 1d66f7334a 微信小程序打卡接口 xiezhijun 2021-03-22 15:51:55 +0800
• a3c0acfadb 客户关系无法清空备注/转换关系/消费项目 sk1551 2021-03-22 15:43:53 +0800
• b65c8d4512 update ruoyi-ui/src/views/system/user/profile/userAvatar.vue. allworldg 2021-03-21 21:20:23 +0800
• 67371a9028 个人信息添加手机&邮箱重复验证 RuoYi 2021-03-21 08:53:11 +0800
• bee860e4b9 !153 优化校验逻辑 Merge pull request !153 from 德仔/develop 德仔 2021-03-20 19:33:01 +0800
• 180f994141 优化校验逻辑 huangdeliang 2021-03-20 19:31:00 +0800
• cec3b4794e !152 修复老的体征数据备注修改 Merge pull request !152 from 德仔/develop 德仔 2021-03-19 18:58:32 +0800
• 21fac2ae86 修复老的体征数据备注修改 huangdeliang 2021-03-19 18:57:07 +0800
• 76d2b5b2fb !151 客户案例修改 Merge pull request !151 from 德仔/xzj 德仔 2021-03-19 18:13:23 +0800
• 82c5ccd1c5 !150 跟换菜品控件 Merge pull request !150 from 德仔/develop 德仔 2021-03-19 17:19:04 +0800
• efd7820da5 调整操作 huangdeliang 2021-03-19 17:18:37 +0800
• 144e3550aa 跟换菜品控件 huangdeliang 2021-03-19 17:08:21 +0800
• 636a808d3a Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-19 16:02:25 +0800
• 8c3eb7ab9c 客户案例修改 xiezhijun 2021-03-19 16:02:12 +0800
• c2eec4e305 !149 图片预览功能 Merge pull request !149 from 德仔/develop 德仔 2021-03-19 10:56:50 +0800
• 5f7e4c45db 图片预览功能 huangdeliang 2021-03-19 10:55:51 +0800
• 39d0e9f6a9 tijiao Peterjonas 2021-03-18 20:14:47 +0800
• 66a8be2b6d !148 修复热量饼图 Merge pull request !148 from 德仔/develop 德仔 2021-03-18 19:53:18 +0800
• 47f77bcc6f 修复热量饼图 huangdeliang 2021-03-18 19:52:10 +0800
• 2d1eef6436 !147 去除食谱生成的时间限制，小程序获取案例接口 Merge pull request !147 from 德仔/xzj 德仔 2021-03-18 19:19:54 +0800
• 16ae8663dd !146 增加bmi值展示 Merge pull request !146 from 德仔/develop 德仔 2021-03-18 19:18:07 +0800
• 871f3dc056 增加bmi值展示 huangdeliang 2021-03-18 19:16:06 +0800
• 88f6b8e955 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-18 18:48:49 +0800
• 9cc0ad82cd 去除食谱生成的时间限制，小程序获取案例接口 xiezhijun 2021-03-18 18:48:28 +0800
• e26a542987 !145 适配中文文件 Merge pull request !145 from 德仔/develop 德仔 2021-03-18 16:47:30 +0800
• a10b8715ce 适配中文文件 huangdeliang 2021-03-18 16:45:24 +0800
• f58668f01c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-18 16:12:08 +0800
• 4247860f69 微信小程序查询案例 xiezhijun 2021-03-18 16:11:54 +0800
• 06397d7456 客户关系省市修改 sk1551 2021-03-18 14:59:58 +0800
• 8f1c94a3af !144 备注信息可换行 Merge pull request !144 from 德仔/develop 德仔 2021-03-18 14:32:13 +0800
• 4fc71f9ac0 备注信息可换行 huangdeliang 2021-03-18 14:31:04 +0800
• b6cd58c553 !143 修复上传图片功能 Merge pull request !143 from 德仔/develop 德仔 2021-03-18 14:02:40 +0800
• 683593ba16 修复上传图片功能 huangdeliang 2021-03-18 14:02:12 +0800
• 86aa3e4898 !142 减脂指导修改界面优化 Merge pull request !142 from 德仔/xzj 德仔 2021-03-18 11:57:15 +0800
• 8b3ae9c299 !141 修复阿里云oss空指针 Merge pull request !141 from 德仔/develop 德仔 2021-03-18 11:56:29 +0800
• 84c851d1db 修复阿里云oss空指针 huangdeliang 2021-03-18 11:55:44 +0800
• 75d11bb9e3 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-17 18:37:00 +0800
• b78a68c807 减脂指导修改界面优化 xiezhijun 2021-03-17 18:36:46 +0800
• 65b6505ef0 !140 修复tooltip Merge pull request !140 from 德仔/develop 德仔 2021-03-17 17:45:34 +0800
• f4521ec9dd 修复tooltip huangdeliang 2021-03-17 17:44:42 +0800
• 5d38073bcc !139 添加热量分析图表 Merge pull request !139 from 德仔/develop 德仔 2021-03-17 17:26:00 +0800
• 9d9701f235 调整 huangdeliang 2021-03-17 17:24:49 +0800
• b36cef2948 添加热量分析图表 huangdeliang 2021-03-17 17:17:09 +0800
• f10c6d7ce5 修改客户维护关系 sk1551 2021-03-17 15:35:19 +0800
• 2c51451859 修改本一3.15问题(客户关系维护) sk1551 2021-03-17 15:28:55 +0800
• 0e710feb33 !138 修复oss图片预览 Merge pull request !138 from 德仔/develop 德仔 2021-03-17 14:40:50 +0800
• ba372bee26 修复oss图片预览 huangdeliang 2021-03-17 14:39:46 +0800
• d1c1d2e539 !137 完成食材图片上传 Merge pull request !137 from 德仔/develop 德仔 2021-03-17 14:18:20 +0800
• 917f2ab975 完成食材图片上传 huangdeliang 2021-03-17 14:15:33 +0800
• 5ec05d913b !136 页面食谱修复备注信息 Merge pull request !136 from 德仔/develop 德仔 2021-03-17 14:01:59 +0800
• 64d232d2d6 页面食谱修复备注信息 huangdeliang 2021-03-17 13:58:05 +0800
• d903f64c7a !135 修复表名称 Merge pull request !135 from 德仔/develop 德仔 2021-03-17 13:46:54 +0800
• 8124005e7e 修复表名称 huangdeliang 2021-03-17 13:45:54 +0800
• 1445450f53 !134 体检报告下载优化 Merge pull request !134 from 德仔/xzj 德仔 2021-03-16 20:12:04 +0800
• b037802a9c !133 食材添加信息 Merge pull request !133 from 德仔/develop 德仔 2021-03-16 20:10:50 +0800
• 1b5a4f3777 食材添加信息 huangdeliang 2021-03-16 20:09:28 +0800
• ca9cafc4c7 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-16 18:40:24 +0800
• 85050259c9 体检报告下载优化 xiezhijun 2021-03-16 18:40:09 +0800
• 94dd93fad4 修改本一客户维护新问题 sk1551 2021-03-16 18:22:38 +0800
• b65f9534e1 Merge branch 'develop' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-16 17:56:45 +0800