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

• 03eb2508b6 食材添加信息 huangdeliang 2021-03-16 17:53:17 +0800
• 7a3ab6bfef 客户档案调整 huangdeliang 2021-03-16 15:05:53 +0800
• 01b545e4ab 通用Controller添加响应返回消息 RuoYi 2021-03-16 14:43:55 +0800
• 4403623811 更改一些需求 zgqahah 2021-03-16 10:53:37 +0800
• 8c5d829153 删除节点 wind 2021-03-16 09:59:36 +0800
• 02c085b2e6 !132 工资比例计算 Merge pull request !132 from 德仔/xzj 德仔 2021-03-15 20:59:02 +0800
• f461c32c52 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-03-15 20:55:55 +0800
• f02235936c 完成忌口检查 huangdeliang 2021-03-15 20:53:32 +0800
• b9c44998f8 添加评价等级 sk1551 2021-03-15 19:25:57 +0800
• d16fc5c0f1 批量审核 zhanglipeng 2021-03-15 18:37:58 +0800
• 8d6ba21dd0 区级审核批量提交 sk1551 2021-03-15 18:02:39 +0800
• 579a8b31ab Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-15 18:02:20 +0800
• 0f03406d4c 工资比例计算 xiezhijun 2021-03-15 18:01:59 +0800
• 05a2289952 添加评价等级 sk1551 2021-03-15 14:14:43 +0800
• c88a57a029 !131 调整 Merge pull request !131 from 德仔/develop 德仔 2021-03-15 14:12:12 +0800
• 5167828ff8 调整 huangdeliang 2021-03-15 14:11:22 +0800
• 737dad45f6 基地校初选 zhanglipeng 2021-03-15 14:05:01 +0800
• 90ac15bda6 基地校初选 zhanglipeng 2021-03-15 11:42:14 +0800
• ae982051aa !130 修复另存为 Merge pull request !130 from 德仔/develop 德仔 2021-03-15 11:39:35 +0800
• 8155373958 修复另存为 huangdeliang 2021-03-15 11:38:09 +0800
• d7675ebe53 工作流管理整合 wind 2021-03-15 09:46:25 +0800
• 07c48ae691 Merge remote-tracking branch 'origin/master' wind 2021-03-15 09:44:33 +0800
• 6e9a510d3c 编辑书签 删除书签 WangHao 2021-03-14 23:40:33 +0800
• e00e2148a9 编辑书签鼠标移入移出显示编辑 修改字段 WangHao 2021-03-14 21:01:56 +0800
• 7a696f2a99 添加评价等级 sk1551 2021-03-14 18:24:39 +0800
• 7588830dd7 基地校初选审核更改 sk1551 2021-03-14 17:15:16 +0800
• 9423be9e25 评选方案文件下载 zhanglipeng 2021-03-14 17:13:38 +0800
• 5de1467cbf 评选方案文件下载 zhanglipeng 2021-03-14 17:10:31 +0800
• 6cf6f2ca40 评选方案文件下载 zhanglipeng 2021-03-14 16:57:21 +0800
• c2e9200626 数据监控默认账户密码防止越权访问 RuoYi 2021-03-14 16:37:34 +0800
• 9502203bbe !187 【漏洞修复】升级commons-collections版本，解决3.2.1版本的反序列化漏洞问题 Merge pull request !187 from Delusive/master 若依 2021-03-14 16:32:07 +0800
• 833f28a503 基地校分配教师导出和导入 zhanglipeng 2021-03-14 16:28:51 +0800
• 16a7f453a9 面试名单导出和导入 zhanglipeng 2021-03-14 12:15:45 +0800
• db1bae8412 笔试名单导出和导入 zhanglipeng 2021-03-14 11:27:36 +0800
• bcdc151f3c 新问题修改 sk1551 2021-03-14 09:31:40 +0800
• e445f40d1d !129 食谱制作状态 Merge pull request !129 from 德仔/develop 德仔 2021-03-13 20:01:04 +0800
• 79a1c4c554 修复健康信息 huangdeliang 2021-03-13 20:00:18 +0800
• 3056bc2b84 修复病史数据 huangdeliang 2021-03-13 19:25:44 +0800
• cac31face0 修复保存后url huangdeliang 2021-03-13 18:30:07 +0800
• 51be6ba97a 食谱制作状态 huangdeliang 2021-03-13 18:21:03 +0800
• a3b07ae8a0 !127 食谱计划优化 Merge pull request !127 from 德仔/xzj 德仔 2021-03-13 17:16:58 +0800
• 2e11a4a0ee 订单查询优化 xiezhijun 2021-03-13 16:32:27 +0800
• 9d03073763 食谱计划更新 xiezhijun 2021-03-13 15:40:34 +0800
• 3e064b5e03 批量处理1.2(修改) Cx_link 2021-03-13 15:28:29 +0800
• 0d9b68bf49 数据移交及工作流 wind 2021-03-13 15:03:35 +0800
• 74b122540f 批量处理 Cx_link 2021-03-13 14:51:56 +0800
• c4cb3e2180 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-13 12:31:09 +0800
• 6fc379613f !128 放开调整时间 Merge pull request !128 from 德仔/develop 德仔 2021-03-13 11:53:48 +0800
• 0f201eb2fd 放开调整时间 huangdeliang 2021-03-13 11:52:56 +0800
• 20a30369bc Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-13 11:41:30 +0800
• 5de284c1d9 食谱计划优化 xiezhijun 2021-03-13 11:41:14 +0800
• 1ec57480d7 !126 购物车添加文字 Merge pull request !126 from 德仔/develop 德仔 2021-03-12 19:00:45 +0800
• 80ac974977 购物车添加文字 huangdeliang 2021-03-12 18:59:50 +0800
• 4761f83a94 !125 修复了修改订单时带上了加*的手机号问题 Merge pull request !125 from 德仔/xzj 德仔 2021-03-12 18:23:27 +0800
• ef26d65b1f !124 删除未审核的食谱计划 Merge pull request !124 from 德仔/develop 德仔 2021-03-12 18:22:23 +0800
• ac7ae33142 删除未审核的食谱计划 huangdeliang 2021-03-12 18:20:43 +0800
• c22bb0b0c9 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-12 17:56:43 +0800
• e2ac5553fc 修复了修改订单时带上了加*的手机号问题 xiezhijun 2021-03-12 17:56:26 +0800
• c0f1569ad9 修复commons-collections引起的反序列化漏洞 hh44h1144 2021-03-12 16:59:06 +0800
• ae62ffd41e 修复拖动 huangdeliang 2021-03-12 15:05:16 +0800
• 20887b1463 重构 删除不必要的代码 zgqahah 2021-03-12 15:02:10 +0800
• 0bc895ecff !123 修复健康信息 Merge pull request !123 from 德仔/develop 德仔 2021-03-12 15:00:10 +0800
• a2773a75c3 修复健康信息 huangdeliang 2021-03-12 14:50:35 +0800
• bb70517634 !122 修改成7天体验 Merge pull request !122 from 德仔/develop 德仔 2021-03-12 09:34:23 +0800
• 9b3e474023 修改成7天体验 huangdeliang 2021-03-12 09:33:04 +0800
• 4049242806 !121 修复冲突 Merge pull request !121 from 德仔/develop 德仔 2021-03-11 18:52:14 +0800
• c6a3a9da2e 修复冲突 huangdeliang 2021-03-11 18:51:29 +0800
• fd05af8a6b !120 合并 Merge pull request !120 from 德仔/xzj 德仔 2021-03-11 18:46:25 +0800
• cd7e18cc0b Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-11 18:44:51 +0800
• 41d8df3895 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-11 18:43:55 +0800
• da905e1092 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-11 18:43:30 +0800
• a2d4c579cc !119 新增1天体验 Merge pull request !119 from 德仔/develop 德仔 2021-03-11 18:39:37 +0800
• c959692e9a 新增1天体验 huangdeliang 2021-03-11 18:36:34 +0800
• 2b571aca92 菜品添加、查询优化 xiezhijun 2021-03-11 18:31:34 +0800
• b6b60b72e3 !118 调整食谱制作页面 Merge pull request !118 from 德仔/develop 德仔 2021-03-11 16:51:09 +0800
• c166c1e29c 1，修复复制数据问题 2，调整食谱制作界面 huangdeliang 2021-03-11 16:50:13 +0800
• 9f33dcc439 !117 模板选择时添加筛选功能 Merge pull request !117 from 德仔/develop 德仔 2021-03-11 11:39:39 +0800
• 59dabbc9d3 模板选择时添加筛选功能 huangdeliang 2021-03-11 11:37:54 +0800
• 9946667f88 !116 修复食谱制作问题 Merge pull request !116 from 德仔/develop 德仔 2021-03-10 19:12:12 +0800
• fc9086103f 1，保持字体 2，替换菜品时备注 3，修复未生成食谱时多次粘贴后删除全删 huangdeliang 2021-03-10 19:10:57 +0800
• 415e7f3859 !115 菜品加大类、小类 Merge pull request !115 from 德仔/xzj 德仔 2021-03-10 17:38:18 +0800
• 6e742dfdab !114 采购计划开发 Merge pull request !114 from 德仔/develop 德仔 2021-03-10 17:37:03 +0800
• 989889f4cf 菜品加大类、小类 xiezhijun 2021-03-10 17:36:10 +0800
• aa555d98c2 采购计划开发 huangdeliang 2021-03-10 17:35:19 +0800
• 761321036f Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-10 15:04:36 +0800
• 46ff288eea Pre Merge pull request !186 from 小宇/N/A 小宇 2021-03-10 12:06:48 +0800
• c77fd5be52 ddd 小宇 2021-03-10 12:06:48 +0800
• f2eb689db5 !113 案例管理优化 Merge pull request !113 from 德仔/xzj 德仔 2021-03-09 18:28:43 +0800
• ff4476532e !112 修改食谱展示 Merge pull request !112 from 德仔/develop 德仔 2021-03-09 18:27:55 +0800
• 7709c85cb0 修改食谱展示 huangdeliang 2021-03-09 18:26:48 +0800
• 6cd13e3e92 Merge branches 'master' and 'xzj' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-03-09 18:25:29 +0800
• addf0fc000 案例管理优化 xiezhijun 2021-03-09 18:25:13 +0800
• 1bfa9e65fc !111 修复食谱计划 Merge pull request !111 from 德仔/develop 德仔 2021-03-09 11:51:59 +0800
• 032b4e8106 修复食谱计划 huangdeliang 2021-03-09 11:50:00 +0800
• 2ad86d7945 消费项目排序和样式 zhanglipeng 2021-03-09 11:44:57 +0800
• 3ed6ecfe2c 重构 删除不必要的代码 zgqahah 2021-03-09 11:40:19 +0800
• 5bbf47ea48 !110 案例文件下载上传优化 Merge pull request !110 from 德仔/xzj 德仔 2021-03-09 11:23:12 +0800
• 4b58e1b6bc 案例文件下载上传优化 xiezhijun 2021-03-09 11:21:30 +0800
• 43203ff88d 按字母排序未完成 sk1551 2021-03-09 10:28:49 +0800
• a557098d1c !109 案例文件打包下载 Merge pull request !109 from 德仔/xzj 德仔 2021-03-08 18:53:48 +0800