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

• 4422518149 updatge wangxinbo 2021-01-10 13:16:42 +0800
• 0522126b91 update wangxinbo 2021-01-10 13:14:46 +0800
• ae36f5a36a 干部-优化 zhanglipeng 2021-01-10 13:04:24 +0800
• 24f7c884c1 !3 开发分支合并到主分支 Merge pull request !3 from 派大星/xinbo 派大星 2021-01-10 12:56:53 +0800
• 81d0a3bd85 !33 更新岗位数据过滤条件 Merge pull request !33 from 德仔/develop 德仔 2021-01-09 21:58:47 +0800
• 99a47de624 更新岗位过滤条件 huangdeliang 2021-01-09 21:57:25 +0800
• 479064fdb9 优化样式-干部基本信息弹框 wangxinbo 2021-01-09 21:15:47 +0800
• 4829d11272 更新合同 huangdeliang 2021-01-09 18:37:15 +0800
• 9add46694d 更新合同 huangdeliang 2021-01-09 18:11:29 +0800
• 34c7e7a2ae metadata design zgqahah 2021-01-09 13:37:50 +0800
• e898c85cbd Pre Merge pull request !163 from 刘呈然/N/A 刘呈然 2021-01-09 03:16:32 +0800
• 80efdcf863 add 21. 刘呈然 2021-01-09 03:16:32 +0800
• 5e41f094a3 Merge branch 'master' of gitee.com:darlk/ShengTangManage into master huangdeliang 2021-01-08 21:08:12 +0800
• d20ec1b58b !32 修改数据库 Merge pull request !32 from 德仔/develop 德仔 2021-01-08 21:00:40 +0800
• 55096f9e45 修改数据库密码 huangdeliang 2021-01-08 20:54:43 +0800
• 32c17daaba 订单页面优化、暂停记录页面优化 xiezhijun 2021-01-08 20:13:48 +0800
• ed85f4acd0 干部-优化 zhanglipeng 2021-01-08 17:28:10 +0800
• 3dffe22aff form designer modify zgqahah 2021-01-08 11:50:58 +0800
• 785e8d575e 干部-优化 zhanglipeng 2021-01-08 11:41:23 +0800
• 14a859899c 代码生成模板支持主子表 RuoYi 2021-01-08 10:47:36 +0800
• f3cb18c836 !161 修复导入数据为负浮点数时，导入结果会丢失精度问题 Merge pull request !161 from 嘿白熊/master 若依 2021-01-08 10:46:36 +0800
• 8f2569d0de 退休干部详情 zhanglipeng 2021-01-08 09:56:12 +0800
• c668d707a2 no commit message 哑巴 2021-01-07 23:38:22 +0800
• 181bf72bc3 !31 修改食材页面 Merge pull request !31 from 德仔/develop 德仔 2021-01-07 23:29:57 +0800
• 05572662cf 修改食材页面 huangdeliang 2021-01-07 23:28:47 +0800
• 1a6e03e7c4 no commit message 哑巴 2021-01-07 22:38:27 +0800
• 6149f96d3b no commit message 哑巴 2021-01-07 22:36:32 +0800
• 49a39668ba no commit message 哑巴 2021-01-07 22:31:03 +0800
• 8ccf9b9c19 no commit message 哑巴 2021-01-07 22:30:35 +0800
• 439dc2fedb no commit message 哑巴 2021-01-07 22:30:14 +0800
• b754254d31 no commit message 哑巴 2021-01-07 22:28:51 +0800
• cd5c088bec no commit message 哑巴 2021-01-07 22:27:14 +0800
• a04fcb77c1 no commit message 哑巴 2021-01-07 22:26:45 +0800
• 62ea4029dd no commit message 哑巴 2021-01-07 22:26:01 +0800
• f6195ea30a no commit message 哑巴 2021-01-07 22:25:35 +0800
• 79820a35c8 no commit message 哑巴 2021-01-07 22:24:50 +0800
• 86d0863c9d no commit message 哑巴 2021-01-07 22:24:29 +0800
• 7e48f526db no commit message 哑巴 2021-01-07 22:23:53 +0800
• 53b49deca9 no commit message 哑巴 2021-01-07 22:23:15 +0800
• 155e76c8e1 no commit message 哑巴 2021-01-07 22:22:12 +0800
• 06a0dc2e90 !30 浏览文件订单增加赠送时长字段，增加服务暂停管理列表，身份证号验证方法优化 Merge pull request !30 from 德仔/xzj 德仔 2021-01-07 21:53:39 +0800
• 340399c720 订单增加赠送时长字段，增加服务暂停管理列表，身份证号验证方法优化 xiezhijun 2021-01-07 19:17:52 +0800
• 09462d74a5 评估优化 zhanglipeng 2021-01-07 17:10:01 +0800
• f62b7601cc 退休干部详情 zhanglipeng 2021-01-07 15:39:58 +0800
• 2dc9eb8f28 Pre Merge pull request !139 from Live/master Live 2021-01-07 13:28:49 +0800
• 7d0eb3b8c7 用户显隐列添加不同key防止被复用 RuoYi 2021-01-07 13:28:16 +0800
• 2d765db180 退休近5年干部查询 zhanglipeng 2021-01-07 11:50:52 +0800
• f72a301890 见习教师成绩导入功能 sk1551 2021-01-07 10:33:09 +0800
• eca5133a80 Merge branch 'master' of gitee.com:suchengcsu/RuoYi-Vue into pengyu Peterjonas 2021-01-06 20:30:40 +0800
• 654aa6b30c 表格右侧工具栏组件支持显隐列 RuoYi 2021-01-06 17:30:39 +0800
• 1a346eb8e3 退休近5年干部查询 zhanglipeng 2021-01-06 15:47:44 +0800
• 96ba99bbda 后备干部查询 zhanglipeng 2021-01-06 15:30:48 +0800
• c90456a4c8 见习教师成绩导入功能 sk1551 2021-01-06 12:56:37 +0800
• 4b6d6cfcc2 干部管理-优化 zhanglipeng 2021-01-06 12:31:30 +0800
• 9440cd4db3 见习教师成绩导入-部分代码 sk1551 2021-01-06 11:43:01 +0800
• b7cdd10f9f 修复导入数据为负浮点数时丢失精度问题 X.B-H 2021-01-06 11:11:11 +0800
• 9bd35cb7be 升级druid到最新版本v1.2.4 RuoYi 2021-01-06 11:00:20 +0800
• 7a86c714fc 代码生成支持文件上传组件 RuoYi 2021-01-06 11:00:09 +0800
• ab9fab9465 用户管理 查询按钮 zhanglipeng 2021-01-06 09:41:07 +0800
• edd090a098 代码生成支持文件上传组件 RuoYi 2021-01-05 20:59:14 +0800
• d80f3aca1a !29 CRM客户导入，客户体征页面优化 Merge pull request !29 from 德仔/xzj 德仔 2021-01-05 20:53:25 +0800
• de795b7249 CRM客户导入，客户体征页面优化 xiezhijun 2021-01-05 20:50:52 +0800
• 3cd886785b 图片组件添加预览功能 RuoYi 2021-01-05 20:33:41 +0800
• ae5a0f9774 新增文件上传组件 RuoYi 2021-01-05 20:11:09 +0800
• 074b3c735d 设置单图上传控件 RuoYi 2021-01-05 16:17:41 +0800
• a118738d0f 单图上传组件添加移除 RuoYi 2021-01-05 16:13:22 +0800
• 6ca9b11208 修改Editor高度 sk1551 2021-01-05 14:22:33 +0800
• 2f0627411c !28 页面调整 Merge pull request !28 from 德仔/xzj 德仔 2021-01-05 11:50:30 +0800
• 3df32e4e1e Merge branch 'master' of https://gitee.com/darlk/ShengTangManage into xzj xiezhijun 2021-01-05 10:22:08 +0800
• 56fa3912ae 修复IE11浏览器报错问题 RuoYi 2021-01-05 09:44:08 +0800
• ee255dfda6 form designer modify zgqahah 2021-01-05 09:07:19 +0800
• 1dde14ee30 no commit message 哑巴 2021-01-04 23:55:22 +0800
• f6b6891824 no commit message 哑巴 2021-01-04 23:47:58 +0800
• 3d24ea8eb1 Pre Merge pull request !160 from Peterjonas/pengyu Peterjonas 2021-01-04 21:30:32 +0800
• 46045f85b3 Merge branch 'master' of gitee.com:y_project/RuoYi-Vue into pengyu Peterjonas 2021-01-04 21:30:31 +0800
• e3e9ddba74 Merge branch 'master' of gitee.com:suchengcsu/RuoYi-Vue into pengyu Peterjonas 2021-01-04 21:27:19 +0800
• 1421da5a29 提交初版 Peterjonas 2021-01-04 21:26:57 +0800
• 1be9f4c0ce 客户体征优化 xiezhijun 2021-01-04 20:28:45 +0800
• 2116ee1822 Update copyright RuoYi 2021-01-04 17:49:52 +0800
• 57a2eb4217 操作按钮组调整为朴素按钮样式 RuoYi 2021-01-04 17:48:46 +0800
• c4924f7593 !27 开发了客户营养体征调查页面 Merge pull request !27 from 德仔/xzj 德仔 2021-01-04 17:03:46 +0800
• f76356da68 客户体征相关 xiezhijun 2021-01-04 16:51:56 +0800
• 69de663277 file uploader zgqahah 2021-01-04 11:02:06 +0800
• 0c546f53e1 托费管理修改按钮 sk1551 2021-01-04 10:11:26 +0800
• 7df01d3c66 !26 完善菜品功能 Merge pull request !26 from 德仔/develop 德仔 2021-01-04 09:34:04 +0800
• 39e5183366 完善菜品功能 huangdeliang 2021-01-04 09:32:37 +0800
• 243eaa558c no commit message 哑巴 2021-01-04 09:23:57 +0800
• d77e7505be 完善菜品功能 huangdeliang 2021-01-03 10:29:53 +0800
• 59d37e5a81 !25 前端完善 Merge pull request !25 from 德仔/develop 德仔 2021-01-03 10:11:13 +0800
• d9558ad754 !24 完善菜品功能 Merge pull request !24 from 德仔/develop 德仔 2021-01-03 09:56:20 +0800
• c89cb1c7a1 完善菜品功能 huangdeliang 2021-01-03 09:55:00 +0800
• 8a71a32dc2 form designer modify zgqahah 2020-12-31 18:27:13 +0800
• 4df90a1884 见习教师成绩导入-部分代码 sk1551 2020-12-31 17:26:52 +0800
• 46f2b7c46f 菜品管理页面 huangdeliang 2020-12-31 16:11:00 +0800
• 35536d02b6 no commit message 哑巴 2020-12-31 00:47:31 +0800
• 6ab397d1b1 no commit message 哑巴 2020-12-31 00:47:12 +0800
• 6e35ef0d12 no commit message 哑巴 2020-12-31 00:46:55 +0800
• e610f79534 修改录取年份和教师名单导出 sk1551 2020-12-30 17:14:24 +0800
• 11c3d1b297 form designer modify zgqahah 2020-12-30 15:49:45 +0800
• a69df6d449 !2 开发分支合并到主分支 Merge pull request !2 from 派大星/xinbo 派大星 2020-12-30 14:30:35 +0800