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

• c3910b627f !71 外食计算 Merge pull request !71 from 德仔/xzj 德仔 2021-02-24 08:53:22 +0800
• 0bd85f1be9 承包商承包站点详情设计 yaowei 2021-02-24 00:28:00 +0800
• 81e79340b8 承包商站点代码优化 yaowei 2021-02-23 23:10:16 +0800
• 20b7697ddc 外食计算 xiezhijun 2021-02-23 18:53:29 +0800
• 728dd00a97 添加一日流程评估计划时创建一日流程评估 部分代码 sk1551 2021-02-23 18:33:51 +0800
• fdc0748d87 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-02-23 18:32:29 +0800
• 9a384a2fc2 解决 Byte[] 类型 to string 死循环的问题 tzg 2021-02-23 16:28:55 +0800
• 9de0e2bffc Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-23 15:36:23 +0800
• c1a937adf4 外食计算优化，添加详情功能 xiezhijun 2021-02-23 15:35:50 +0800
• f36279876d !70 新增global，缓存职位信息 Merge pull request !70 from 德仔/develop 德仔 2021-02-23 15:11:37 +0800
• df52ea8f2d 新增global，缓存职位信息 huangdeliang 2021-02-23 15:09:17 +0800
• f10dec7fd2 'params字符串数组/数字数组正确格式化方式' shoukaiseki 2021-02-23 13:47:07 +0800
• 66f3dea2b4 !69 紧急修复 Merge pull request !69 from 德仔/develop 德仔 2021-02-23 13:39:12 +0800
• 6b50ddcfdd 紧急修复 huangdeliang 2021-02-23 13:38:07 +0800
• 740cbc4d5c !68 修复未生成食谱逻辑错误 Merge pull request !68 from 德仔/develop 德仔 2021-02-23 13:34:58 +0800
• 666cb34d2a 修复未生成食谱逻辑错误 huangdeliang 2021-02-23 12:00:06 +0800
• dc4e0bc6d2 问题修复 yaowei 2021-02-23 00:40:03 +0800
• ca40b85da1 人员站点信息 yaowei 2021-02-23 00:19:19 +0800
• efd0e059c4 站点和承包商站点 yaowei 2021-02-22 23:59:35 +0800
• e1abc2a02d 代码优化 yaowei 2021-02-22 23:31:34 +0800
• ef71b17bf2 代码优化 yaowei 2021-02-22 23:14:42 +0800
• 60116b6eae !67 修复错误 Merge pull request !67 from 德仔/develop 德仔 2021-02-22 20:00:13 +0800
• 81ce32847a 修复错误 huangdeliang 2021-02-22 19:59:14 +0800
• f825e527bb !66 食谱制作出版 Merge pull request !66 from 德仔/develop 德仔 2021-02-22 19:49:53 +0800
• 5c5709d606 Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop 德仔 2021-02-22 19:49:36 +0800
• 7b9d38f1ca !65 外食计算器优化，营养成分以及热量比例数据计算 Merge pull request !65 from 德仔/xzj 德仔 2021-02-22 19:47:06 +0800
• de4e43af4e 修复选项 huangdeliang 2021-02-22 19:45:33 +0800
• 3f620ed894 生成食谱接口对接 huangdeliang 2021-02-22 19:36:01 +0800
• 473ccef008 外食计算器优化，营养成分以及热量比例数据计算 xiezhijun 2021-02-22 19:30:33 +0800
• 238c0dc0db 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-02-22 18:26:58 +0800
• acdd617cbd 一日流程评估计划名称自动获取&一日流程评估班级教师获取 sk1551 2021-02-22 18:10:02 +0800
• 339b932a3d 富文本编辑组件支持只读 Josway 2021-02-22 17:49:17 +0800
• 5191bd7fda Pre Merge pull request !136 from 蒋カイセキ/master 蒋カイセキ 2021-02-22 09:41:35 +0800
• 0b5c7f4c96 若依 3.4.0 v3.4.0 RuoYi 2021-02-22 09:40:28 +0800
• b4f70fa741 !64 外食计算器功能优化修改 Merge pull request !64 from 德仔/xzj 德仔 2021-02-22 09:03:36 +0800
• 0938d7f37c ^^ zgqahah 2021-02-21 22:05:04 +0800
• b287406a58 代码优化 yaowei 2021-02-21 21:31:06 +0800
• e3d08f60e4 ^^ zgqahah 2021-02-21 20:57:51 +0800
• f1bc231129 承包商和工人录入 yaowei 2021-02-21 17:16:43 +0800
• 241eb52434 代码优化 yaowei 2021-02-21 14:02:32 +0800
• 7195503216 承包商和资质信息 yaowei 2021-02-21 13:00:42 +0800
• 265e3010aa 升级SpringBoot到最新版本2.2.13 RuoYi 2021-02-21 11:01:56 +0800
• 406d70c059 Pre Merge pull request !179 from 你说嗨我说拜/master 你说嗨我说拜 2021-02-21 09:41:51 +0800
• bb8cc8d18e 1.增加electron 2.增加接口耗时打印 3.升级springboot，修复过期方法 4.去掉验证码校验 wuchunhao 2021-02-21 09:41:44 +0800
• 232fde540b 1.springboot升级道2.4.3 2.修复新版本springboot的max-threads、min-spare-threads参数过期问题 3.修复新版本springboot的CorsFilter Bean重复创建问题 4.修复新版本springboot的HandlerInterceptorAdapter过期问题 wuchunhao 2021-02-21 09:23:41 +0800
• 3f5424394d 添加承包商信息 yaowei 2021-02-21 01:20:59 +0800
• 072fa4cc1f 与钉钉整合 yaowei 2021-02-20 22:34:31 +0800
• a7ca979d06 菜品增删查改对接 huangdeliang 2021-02-20 19:46:13 +0800
• 3f3fcda862 外食计算器功能优化修改 xiezhijun 2021-02-20 19:38:17 +0800
• e34d3c502f update：RepeatableFilter防止重复提交过滤器无法转换request对象为RepeatedlyRequestWrapper lyflyy 2021-02-20 19:31:41 +0800
• 64be6ddf84 模板管理新增功能编写 模板管理新增表单 zgqahah 2021-02-20 18:01:42 +0800
• 1ea9fa7143 与钉钉整合 yaowei 2021-02-20 14:06:51 +0800
• afdee0abdf !63 外食计算器 Merge pull request !63 from 德仔/xzj 德仔 2021-02-19 19:16:58 +0800
• 20371f9469 外食计算器 xiezhijun 2021-02-19 19:14:26 +0800
• 854171897d 食谱编辑交互 huangdeliang 2021-02-19 19:08:08 +0800
• 3c42485f52 Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-02-19 09:33:00 +0800
• 9c075786b4 刷新选中的目录节点功能 WangHao 2021-02-18 23:26:33 +0800
• e404c3be1a 完成菜品修改 huangdeliang 2021-02-18 17:05:10 +0800
• 00cf5f8cdd 修改ztree目录树为异步加载方式 WangHao 2021-02-16 22:42:42 +0800
• ae6d354b6f 计算目录下的书签数量 WangHao 2021-02-15 15:33:49 +0800
• d655b29ffd 重构目录功能 添加目录串 WangHao 2021-02-15 00:14:10 +0800
• bf5556685b 更新 LAPTOP-SHO5E78J\yelifeng 2021-02-13 22:37:37 +0800
• 0a5d9dc480 修复无书签不显示提示问题 WangHao 2021-02-13 21:16:33 +0800
• fec325e383 Redis实现接口防重复点击 WangHao 2021-02-13 20:52:17 +0800
• 38e4f2aa04 导入浏览器书签 WangHao 2021-02-13 20:00:25 +0800
• 87b4e38462 修复回收站和全部书签查看 WangHao 2021-02-12 19:38:54 +0800
• b7a36bfe8a 修改ip字段长度防止ipv6地址长度不够 RuoYi 2021-02-10 12:48:52 +0800
• cdb4db2ffb !62 修复样式遮挡 Merge pull request !62 from 德仔/develop 德仔 2021-02-09 15:09:44 +0800
• 3554bee2b3 修复样式遮挡 huangdeliang 2021-02-09 15:07:27 +0800
• 223525b313 !61 修复菜品修改问题 Merge pull request !61 from 德仔/develop 德仔 2021-02-09 14:17:58 +0800
• 5f4b1ec33f Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop huangdeliang 2021-02-09 14:17:37 +0800
• 1775b657a7 修复菜品修改问题 huangdeliang 2021-02-09 14:10:47 +0800
• ab630fd612 !60 修复通俗重量 Merge pull request !60 from 德仔/develop 德仔 2021-02-09 10:27:08 +0800
• afb7465281 修复通俗重量 huangdeliang 2021-02-09 10:25:34 +0800
• 60f25fc199 修复回收站功能 WangHao 2021-02-07 18:25:30 +0800
• f8f40dc91c 食谱制作界面 huangdeliang 2021-02-06 19:29:53 +0800
• c800fb1aa3 食谱制作界面 huangdeliang 2021-02-06 19:29:33 +0800
• 9a2e9bde62 订单类型改版 xiezhijun 2021-02-06 18:34:57 +0800
• 3a51c53823 角色非自定义权限范围清空选择值 RuoYi 2021-02-06 10:34:12 +0800
• 65859f17ba !59 客户健康信息加上备注编辑修改 Merge pull request !59 from 德仔/xzj 德仔 2021-02-06 09:33:16 +0800
• df504c5c14 修复四级菜单无法显示问题 RuoYi 2021-02-06 09:29:50 +0800
• 87735820d9 客户健康信息加上备注编辑修改 xiezhijun 2021-02-05 18:31:13 +0800
• 322924ef1a 新建模块 修改新模块 将之前的模块代码迁移 zgqahah 2021-02-05 16:41:07 +0800
• 7f52433ac8 新建模块 修改新模块 将之前的模块代码迁移 zgqahah 2021-02-05 16:29:01 +0800
• 05af626470 一日流程评估 zhanglipeng 2021-02-05 15:45:32 +0800
• 30e3c01522 一日流程评估计划加入园历 zhanglipeng 2021-02-05 14:22:17 +0800
• 865528266d 一日流程评估计划管理完成 zhanglipeng 2021-02-05 10:50:27 +0800
• 771e6e4759 新建模块 修改新模块 将之前的模块代码迁移 zgqahah 2021-02-05 09:05:24 +0800
• d78cb2f870 文件夹改名2 huangdeliang 2021-02-05 08:36:01 +0800
• e13260c891 文件夹改名1 huangdeliang 2021-02-05 08:35:39 +0800
• c602cbc0d0 !58 微信导粉统计 Merge pull request !58 from 德仔/xzj 德仔 2021-02-04 21:16:50 +0800
• 615286a1ae Merge branch 'master' of gitee.com:darlk/ShengTangManage into xzj 德仔 2021-02-04 21:16:35 +0800
• 0283eb0a1d 微信导粉统计 xiezhijun 2021-02-04 20:12:46 +0800
• e4e6bfe322 Pre Merge pull request !177 from Windy/dev_20210204_Windy Windy 2021-02-04 17:55:02 +0800
• e9cd2f980b 初始修改服务器配置 Windy 2021-02-04 17:51:46 +0800
• 79c9b6af4d 新建模块 修改新模块 将之前的模块代码迁移 zgqahah 2021-02-04 15:27:28 +0800
• 8f49d4070b Pre Merge pull request !176 from l-uang/N/A l-uang 2021-02-04 11:19:07 +0800
• 1599626136 update pom.xml. l-uang 2021-02-04 11:19:07 +0800
• 94cf3fa544 确认弹框响应式优化 zhanglipeng 2021-02-04 10:12:56 +0800
• 8427a85afb !57 修复虚拟订单逻辑 Merge pull request !57 from 德仔/develop 德仔 2021-02-03 18:59:25 +0800