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

• adbd34ac23 update ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java. 当类使用继承的时候,通过getDeclaredMethod无法正确的获取到父类的方法, 而这种模式在基于abstract类是很常用的操作 林子vs守望者 2021-04-07 00:44:01 +0800
• 25b5fcba49 !194 修复菜谱截取功能 Merge pull request !194 from 德仔/develop 德仔 2021-04-06 19:16:10 +0800
• f2946fea59 修复菜谱截取功能 huangdeliang 2021-04-06 19:13:54 +0800
• 56547aabcc 任务同步会员心得 zhanglipeng 2021-04-06 18:31:35 +0800
• 13f25e4f02 !193 订单order_id使用时间戳 Merge pull request !193 from 德仔/xzj 德仔 2021-04-06 16:01:31 +0800
• 45a47a29a4 订单order_id使用时间戳 xiezhijun 2021-04-06 15:52:26 +0800
• ba10d518de 提成转移算法优化 xiezhijun 2021-04-06 13:47:51 +0800
• 6fe9a358b7 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java. yvan7123 2021-04-06 11:47:27 +0800
• 37972c062a 修改拖为托 sk1551 2021-04-06 09:00:37 +0800
• 862a093e54 评估一日流程 zhanglipeng 2021-04-05 18:02:31 +0800
• 8abfbae5ff mybatis 事务 和 批量插入 WangHao 2021-04-05 16:16:16 +0800
• bb01b94a52 整理权限 WangHao 2021-04-04 19:50:45 +0800
• 01c4b38e7d 评估一日流程 zhanglipeng 2021-04-04 17:34:28 +0800
• 6d77e6e07c Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-04-03 18:38:35 +0800
• d0b2cf7d3d 营养师、售后更换的提成转移，食谱计划生成优化等 xiezhijun 2021-04-03 18:38:20 +0800
• 9f6bc13e64 🔥 去除多余代码 wangze 2021-04-02 23:06:48 +0800
• ba5ab4b091 用户、角色单条删除时，使其逻辑删除 wangze 2021-04-02 22:49:19 +0800
• 17407d0127 调整cache_repeat_key为驼峰格式 wangze 2021-04-02 22:40:15 +0800
• 3d6e2147a6 Pre Merge pull request !198 from dongping_8887/master dongping_8887 2021-04-02 21:57:06 +0800
• e390e5e208 1. 去除pom中tab符 2. 提取spring-boot-dependencies版本到配置中 董平 2021-04-02 21:53:15 +0800
• 441da1f7cb !192 快捷功能开发完成 Merge pull request !192 from 德仔/develop 德仔 2021-04-02 16:36:42 +0800
• f412a4e70e 快捷功能开发完成 huangdeliang 2021-04-02 16:33:27 +0800
• 49f80af8a6 !191 食谱计划生成修改，根据客户ID重新生成，暂停记录不需要加订单ID Merge pull request !191 from 德仔/xzj 德仔 2021-04-01 19:33:06 +0800
• 0df3eb6b77 !190 添加制作中 Merge pull request !190 from 德仔/develop 德仔 2021-04-01 19:30:09 +0800
• 2323add9bf 添加制作中 huangdeliang 2021-04-01 19:27:39 +0800
• 8345aa2991 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-04-01 18:45:56 +0800
• 5d95de3a2a 食谱计划生成修改，根据客户ID重新生成，暂停记录不需要加订单ID xiezhijun 2021-04-01 18:45:41 +0800
• 81f6f836f5 !189 修复健康数据问题 Merge pull request !189 from 德仔/develop 德仔 2021-04-01 17:42:56 +0800
• 4cf6867be0 修复健康数据问题 huangdeliang 2021-04-01 17:25:58 +0800
• ead1d79cfe 加入列出所有缓存，并且可以清空缓存，也可以单个删除缓存 lucas 2021-03-31 14:23:06 +0800
• 476afc8fc1 三级联动二次提交 sk1551 2021-03-30 18:07:45 +0800
• aa5f8980f8 修改客户维护省市区三级联动 sk1551 2021-03-30 17:51:26 +0800
• 30f330f4a0 修复firefox下表单构建拖拽会新打卡一个选项卡 RuoYi 2021-03-30 17:45:35 +0800
• ff016069a1 !188 合同签订后跳转问题 Merge pull request !188 from 德仔/develop 德仔 2021-03-30 17:40:48 +0800
• 9d9cd081f5 合同签订后跳转问题 huangdeliang 2021-03-30 17:33:18 +0800
• b8a8047b9d !187 修复食谱计划bug Merge pull request !187 from 德仔/develop 德仔 2021-03-30 17:21:41 +0800
• 14a4738807 去除log huangdeliang 2021-03-30 17:20:49 +0800
• f7b0805335 修复食谱计划bug huangdeliang 2021-03-30 17:20:15 +0800
• 33cf8078cc 修复食谱计划bug huangdeliang 2021-03-30 17:20:05 +0800
• a4d8fc3544 !186 添加食谱计划发送状态开关 Merge pull request !186 from 德仔/develop 德仔 2021-03-30 16:45:52 +0800
• fa3698cf16 添加食谱计划发送状态开关 huangdeliang 2021-03-30 16:44:50 +0800
• 7010eb30bd !185 订单导出修改，增加进粉时间 Merge pull request !185 from 德仔/xzj 德仔 2021-03-30 15:42:47 +0800
• 6ca7870393 修正注释 RuoYi 2021-03-30 15:30:18 +0800
• e8b0ae2cd7 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-30 15:29:37 +0800
• 8b07969264 订单导出修改，增加进粉时间 xiezhijun 2021-03-30 15:29:24 +0800
• 2a7342ec43 !195 读取excel增加非空判断 Merge pull request !195 from 叫我宏锅锅/yuhong 若依 2021-03-30 15:23:04 +0800
• 9c010900db !184 修复修改信息 Merge pull request !184 from 德仔/develop 德仔 2021-03-30 15:20:18 +0800
• fc57e91b80 !196 RepeatedlyRequestWrapper.ServletInputStream 实现available方法 Merge pull request !196 from wangyang/master 若依 2021-03-30 15:17:34 +0800
• e613c44893 修复修改信息 huangdeliang 2021-03-30 15:02:45 +0800
• 49d5364022 !183 修改气血数据 Merge pull request !183 from 德仔/develop 德仔 2021-03-30 13:46:43 +0800
• 20466936ce 修改气血数据 huangdeliang 2021-03-30 13:45:33 +0800
• 3119fa90e2 !182 进粉统计加上时间范围筛选 Merge pull request !182 from 德仔/xzj 德仔 2021-03-29 19:44:47 +0800
• 57c5470a23 !181 处理暂停日期 Merge pull request !181 from 德仔/develop 德仔 2021-03-29 19:43:17 +0800
• 8f94c50d22 处理暂停日期 huangdeliang 2021-03-29 19:42:00 +0800
• 6fe95722e2 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-03-29 18:59:55 +0800
• e93bce4731 进粉统计加上时间范围筛选 xiezhijun 2021-03-29 18:40:28 +0800
• 347f36ceff fix:RepeatedlyRequestWrapper.ServletInputStream 实现available方法 wangyuanyang 2021-03-29 10:17:31 +0800
• 69dfc9ebe9 !180 提成明细优化 Merge pull request !180 from 德仔/xzj 德仔 2021-03-29 09:04:54 +0800
• 9b9c1b999f 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。 yuhong0206@sina.cn 2021-03-29 09:00:44 +0800
• ec627704b2 取消 yuhong0206@sina.cn 2021-03-29 08:58:46 +0800
• 9e6b2a1265 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。 yuhong0206@sina.cn 2021-03-29 08:56:51 +0800
• b87b96d46e 提成明细优化 xiezhijun 2021-03-28 17:38:38 +0800
• b90eff14b0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-27 19:29:28 +0800
• 4bee383358 提成详情 xiezhijun 2021-03-27 19:29:15 +0800
• 870efe5b55 老体征信息添加备注 huangdeliang 2021-03-27 17:24:32 +0800
• 266a5e844f !193 修复request.getInputStream() 重复读取错误问题 Merge pull request !193 from MccRay/master 若依 2021-03-27 13:22:01 +0800
• 02125071e6 Pre Merge pull request !194 from zhuangzhuangchen/chenenzhuang zhuangzhuangchen 2021-03-27 11:30:09 +0800
• d2b04edd57 '项目发布' zhuangzhuangchen 2021-03-27 11:28:37 +0800
• 5d4f07a6e4 !179 修改合同签订页面 Merge pull request !179 from 德仔/develop 德仔 2021-03-27 11:23:22 +0800
• cd22a2ca7f 修改合同签订页面 huangdeliang 2021-03-27 11:22:20 +0800
• 6bde37a1b2 '菜单、角色、用户配置' zhuangzhuangchen 2021-03-26 21:14:05 +0800
• fb63a4832d !178 订单按天计算详情 Merge pull request !178 from 德仔/xzj 德仔 2021-03-26 19:37:31 +0800
• b1d2c60f4f Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-26 19:04:57 +0800
• 74cfe232a8 订单按天计算详情 xiezhijun 2021-03-26 19:04:44 +0800
• 62e93e99a3 !177 修复食谱备注 Merge pull request !177 from 德仔/develop 德仔 2021-03-26 18:10:12 +0800
• d75984ed3a 修复食谱备注 huangdeliang 2021-03-26 18:09:12 +0800
• 9397aa954b !176 修复同一天同一餐别菜名相同合并的情况 Merge pull request !176 from 德仔/develop 德仔 2021-03-26 16:57:14 +0800
• 36384820bb 修复同一天同一餐别菜名相同合并的情况 huangdeliang 2021-03-26 16:55:55 +0800
• 00a490b8af !175 食谱导出功能 Merge pull request !175 from 德仔/develop 德仔 2021-03-26 16:10:32 +0800
• 4ce5f3f7da 食谱导出功能 huangdeliang 2021-03-26 16:09:27 +0800
• 5f1710b927 !174 修改细节 Merge pull request !174 from 德仔/develop 德仔 2021-03-26 14:42:43 +0800
• 6fe2d84e5e 修改细节 huangdeliang 2021-03-26 14:41:33 +0800
• 6c0796342b !173 修复食谱采购统计问题 Merge pull request !173 from 德仔/develop 德仔 2021-03-26 14:17:12 +0800
• 86bb66a757 修复食谱采购统计问题 huangdeliang 2021-03-26 14:16:08 +0800
• 275f8c2437 !172 食谱计划生成时更新天数，食谱暂停限制范围，不能添加上月日期 Merge pull request !172 from 德仔/xzj 德仔 2021-03-26 09:37:36 +0800
• ce292b236a Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-25 18:58:50 +0800
• f937285895 食谱计划生成时更新天数，食谱暂停限制范围，不能添加上月日期 xiezhijun 2021-03-25 18:54:29 +0800
• ceb0c6e6b1 !171 加上定金单不生成食谱 Merge pull request !171 from 德仔/xzj 德仔 2021-03-25 17:42:12 +0800
• 56bcd16126 加上定金单不生成食谱 xiezhijun 2021-03-25 17:40:46 +0800
• 0822680158 update ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java. 修复 getInputStream() has already been called for this request异常问题 MccRay 2021-03-25 17:39:51 +0800
• 4fece27960 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-25 17:27:01 +0800
• dffca92564 提成计算优化，新增提成计算开始时间 xiezhijun 2021-03-25 17:26:47 +0800
• 2a23b51612 !170 修改食材，菜品删除逻辑 Merge pull request !170 from 德仔/develop 德仔 2021-03-25 16:58:34 +0800
• b4e66b2cda 修改食材，菜品删除逻辑 huangdeliang 2021-03-25 16:42:05 +0800
• 969ccdaeba !169 修复健康评估 Merge pull request !169 from 德仔/develop 德仔 2021-03-25 11:15:11 +0800
• 6d1fa36021 修复健康评估 huangdeliang 2021-03-25 11:12:39 +0800
• 0546388916 !168 打卡接口sql优化 Merge pull request !168 from 德仔/xzj 德仔 2021-03-24 19:04:33 +0800
• 63ab5bdc85 打卡接口sql优化 xiezhijun 2021-03-24 18:36:31 +0800
• 7cd539e8a4 !167 新增当天采购计划 Merge pull request !167 from 德仔/develop 德仔 2021-03-24 17:18:53 +0800
• 6213754ca0 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-24 17:17:29 +0800