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

• 2b1b93e50e
  Pre Merge pull request !478 from lizf/v3.8.2.1 lizf 2022-05-01 12:24:27 +0000
• cf8763cabf
  Pre Merge pull request !475 from XCSDN/N/A XCSDN 2022-05-01 12:24:26 +0000
• b7f2a567fe
  Pre Merge pull request !470 from XCSDN/N/A XCSDN 2022-05-01 12:24:25 +0000
• 9c3e201733
  Pre Merge pull request !473 from 耿嘉祺/master 耿嘉祺 2022-05-01 12:24:25 +0000
• 99f1b1f6b0
  Pre Merge pull request !467 from zhanglufang/N/A zhanglufang 2022-05-01 12:24:24 +0000
• b4592ac3db
  Pre Merge pull request !460 from 刘大人请吃芒/master 刘大人请吃芒 2022-05-01 12:24:23 +0000
• c517e3fd62
  Pre Merge pull request !462 from 后知后觉/dev-zhy 后知后觉 2022-05-01 12:24:23 +0000
• 65626f2f45
  Pre Merge pull request !454 from furyHuang/master furyHuang 2022-05-01 12:24:22 +0000
• 831703c6d1
  Pre Merge pull request !459 from abbfun/N/A abbfun 2022-05-01 12:24:22 +0000
• 0c7f10a5da
  Pre Merge pull request !449 from tigerkidd/master tigerkidd 2022-05-01 12:24:21 +0000
• fd8494c268
  Pre Merge pull request !441 from 莫等闲/master 莫等闲 2022-05-01 12:24:20 +0000
• 7886dbcf86
  Pre Merge pull request !435 from zszdevelop/fix_dept_recursion_bug zszdevelop 2022-05-01 12:24:19 +0000
• 518c180dce
  Pre Merge pull request !430 from 夏月漱石/N/A 夏月漱石 2022-05-01 12:24:17 +0000
• 6805708bd8
  Pre Merge pull request !432 from 徐磊/smartide 徐磊 2022-05-01 12:24:17 +0000
• 47bcda395a
  Pre Merge pull request !417 from yangyang/fixed_issue(#I4R4C8) yangyang 2022-05-01 12:24:16 +0000
• 785d05f295
  Pre Merge pull request !411 from chf12mm/master chf12mm 2022-05-01 12:24:15 +0000
• 9e138ee23d
  Pre Merge pull request !408 from zcx5825585/pr zcx5825585 2022-05-01 12:24:14 +0000
• 4e1e9c87f4
  Pre Merge pull request !404 from SG/master SG 2022-05-01 12:24:13 +0000
• 774a9f8803
  Pre Merge pull request !407 from abbfun/N/A abbfun 2022-05-01 12:24:13 +0000
• e572769b65
  Pre Merge pull request !400 from xlt/master xlt 2022-05-01 12:24:12 +0000
• 107a7d2dea
  Pre Merge pull request !403 from zhaowendong/master zhaowendong 2022-05-01 12:24:12 +0000
• 9a14143c07
  Pre Merge pull request !394 from 呼叫彩虹/N/A 呼叫彩虹 2022-05-01 12:24:11 +0000
• 1ef9ee5c36
  Pre Merge pull request !386 from 稚屿/N/A 稚屿 2022-05-01 12:24:10 +0000
• 54005ad96a
  Pre Merge pull request !372 from Hacker/N/A Hacker 2022-05-01 12:24:09 +0000
• a9287408ae
  Pre Merge pull request !366 from lihy2021/N/A lihy2021 2022-05-01 12:24:08 +0000
• c0318d7958
  Pre Merge pull request !371 from 斗罗/master 斗罗 2022-05-01 12:24:08 +0000
• 14dba8a608
  Pre Merge pull request !362 from 卓越不凡/master 卓越不凡 2022-05-01 12:24:07 +0000
• 622e7d2da9
  Pre Merge pull request !339 from poplartang/N/A poplartang 2022-05-01 12:24:06 +0000
• 1295bef843
  Pre Merge pull request !337 from nadirvishun/master nadirvishun 2022-05-01 12:24:05 +0000
• da2a490088
  Pre Merge pull request !336 from 稚屿/N/A 稚屿 2022-05-01 12:24:04 +0000
• 163a668f29
  Pre Merge pull request !326 from zhengchalei/N/A zhengchalei 2022-05-01 12:24:03 +0000
• eda0c1686d
  Pre Merge pull request !320 from 小驴/master 小驴 2022-05-01 12:24:02 +0000
• c0c4e88e76
  Pre Merge pull request !306 from linan/master linan 2022-05-01 12:24:01 +0000
• f1e165fea5
  Pre Merge pull request !300 from air0001/N/A air0001 2022-05-01 12:24:00 +0000
• aff5c2a4ea
  Pre Merge pull request !280 from jy352/dev jy352 2022-05-01 12:23:59 +0000
• 4046fbbb0f
  Pre Merge pull request !279 from Yongen/master Yongen 2022-05-01 12:23:58 +0000
• e6c16d2254
  Pre Merge pull request !267 from 稚屿/N/A 稚屿 2022-05-01 12:23:57 +0000
• a615da7c4a
  Pre Merge pull request !270 from 稚屿/N/A 稚屿 2022-05-01 12:23:57 +0000
• 20b2267218
  Pre Merge pull request !257 from 學不會/N/A 學不會 2022-05-01 12:23:56 +0000
• f13e7bb029
  Pre Merge pull request !256 from 稚屿/N/A 稚屿 2022-05-01 12:23:55 +0000
• 59693b173f
  Pre Merge pull request !223 from 木土/N/A 木土 2022-05-01 12:23:54 +0000
• 3c6c3a7e94
  Pre Merge pull request !213 from chann/master chann 2022-05-01 12:23:52 +0000
• 9476f7f616 升级spring-boot到最新版本2.5.13 RuoYi 2022-05-01 20:22:35 +0800
• cbe405f6ea ui code format RuoYi 2022-05-01 20:22:25 +0800
• 093ef6cb8a 新增has的directive 码农小易 2022-05-01 18:43:39 +0800
• 7414bc492e 修改代码生成树选择组件 RuoYi 2022-04-25 10:27:06 +0800
• 6f14087a16 修改显示顺序orderNum类型为整型 RuoYi 2022-04-25 10:23:47 +0800
• 3e034b892f
  spring-boot 最新版本2.5.13 abbfun 2022-04-23 13:44:05 +0000
• f37f6663ad
  Pre Merge pull request !469 from ZhangRui/fix_issue_I5302M ZhangRui 2022-04-23 12:55:17 +0000
• 328d4b916d Excel注解支持color字体颜色 RuoYi 2022-04-23 20:53:16 +0800
• fefd8abcc5 mvn  自动化推入sql lizhifeng 2022-04-21 19:04:37 +0800
• e13f7c5c19 Merge remote-tracking branch 'origin/master' into v3.8.2.1 lizhifeng 2022-04-21 15:21:22 +0800
• eb01e3805a
  Pre Merge pull request !477 from lizf/v3.8.2.1 lizf 2022-04-19 14:07:53 +0000
• 0d85eecb06 修复了重复运行./run.sh start 问题 lizhifeng 2022-04-19 22:07:36 +0800
• f05464ec79 修改成为相对路径 lizhifeng 2022-04-19 14:28:47 +0800
• 5c4aae9681 提交脚本 lizhifeng 2022-04-19 13:33:25 +0800
• e97f0049a8
  Pre Merge pull request !476 from 酱子/master 酱子 2022-04-19 01:35:55 +0000
• 439eb96083 移除支付模块 酱子 2022-04-19 09:35:48 +0800
• 186595e5ab
  !1 【轻量级 PR】：update .ide/README.md. Merge pull request !1 from 旅.陈/N/A 徐磊 2022-04-18 11:57:43 +0000
• 36064cbbc2
  update .ide/README.md. 旅.陈 2022-04-18 11:53:32 +0000
• 9995999faf Merge branch 'master' of gitee.com:y_project/RuoYi-Vue into master 酱子 2022-04-18 03:08:34 +0000
• 429f63cfb7
  关于ImagePreview组件，新增一个判断是否为外部链接的utill方法，简单粗暴，干净又卫生啊兄弟们，另外加了一个判断如果地址为空则使用若依logo进行显示 XCSDN 2022-04-17 13:38:32 +0000
• b42a8176ca 设置分页参数默认值 RuoYi 2022-04-17 10:29:12 +0800
• e0ea70be76
  Pre Merge pull request !474 from Eva初号机/N/A Eva初号机 2022-04-17 01:52:12 +0000
• 8896e5f590
  若依 Eva初号机 2022-04-17 01:52:11 +0000
• 2a9beec31d 检查定时任务bean所在包名是否为白名单配置 RuoYi 2022-04-16 22:06:25 +0800
• 910fe6261b 新增获取不带后缀文件名称方法 RuoYi 2022-04-16 22:06:15 +0800
• 0c820b96d8
  !471 新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们 Merge pull request !471 from XCSDN/N/A 若依 2022-04-16 13:53:10 +0000
• 4f78f9ec4c 更改生成器初始化列属性字段时判断具体的数字类型的方式 1. 增加了数据库数字类型常量 2. 修改了初始化列属性字段中判断具体的数字类型的方式 耿嘉祺 2022-04-16 15:32:29 +0800
• 08a8da66f3
  Pre Merge pull request !472 from 耿嘉祺/master 耿嘉祺 2022-04-16 07:22:55 +0000
• 9de03b15e9 Revert "同步数据库表时保留更多信息（是否列表、是否查询、显示类型）" 耿嘉祺 2022-04-16 15:22:48 +0800
• 0684438892 同步数据库表时保留更多信息（是否列表、是否查询、显示类型） 耿嘉祺 2022-04-16 15:18:29 +0800
• 492a218428 更改生成器初始化列属性字段时判断具体的数字类型的方式 1. 增加了数据库数字类型常量 2. 修改了初始化列属性字段中判断具体的数字类型的方式 耿嘉祺 2022-04-16 15:11:04 +0800
• c60d075537
  Pre Merge pull request !471 from XCSDN/N/A XCSDN 2022-04-16 06:02:09 +0000
• c3c49a05c2
  新增一个取文件名而不带后缀的整合方法,干净又卫生啊兄弟们 XCSDN 2022-04-16 06:02:07 +0000
• e9b5cc98d0
  使用spring框架的md5进行优化可以直接效验字符串 字节 文件流 方便又卫生 XCSDN 2022-04-16 05:30:24 +0000
• 07c2e9c82e refactor: 将keys标记为不建议使用 zhangRui 2022-04-15 19:55:45 +0800
• 6645f7c5ce fix: 修复 #I5302M 问题的前两点 zhangRui 2022-04-15 19:49:36 +0800
• 26c2313de2
  Pre Merge pull request !468 from 耿嘉祺/master 耿嘉祺 2022-04-15 08:58:54 +0000
• 43bfbf87d7 同步数据库表时保留更多信息 1. 增加代码生成通用常量中的数据库时间类型datetime2（SQL Server） 2. 字段如果在列表中显示，增加保留显示类型选项 耿嘉祺 2022-04-15 16:58:25 +0800
• 68a616d7c7 升级element-ui到最新版本2.15.8 RuoYi 2022-04-15 09:32:21 +0800
• a0447de061 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线） RuoYi 2022-04-15 09:31:51 +0800
• 7a7bbc7c9c
  Pre Merge pull request !434 from HuangXin/N/A HuangXin 2022-04-15 01:18:38 +0000
• 46db06a22b
  !465 update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. Merge pull request !465 from XCSDN/N/A 若依 2022-04-15 01:17:21 +0000
• 1b088c1803
  update ruoyi-admin/src/main/resources/application-druid.yml. 数据库配置设置了动态的参数，设置的参数有主机地址，数据库名，用户名，密码 zhanglufang 2022-04-13 08:37:29 +0000
• 118dda298b Pre Merge pull request !465 from XCSDN/N/A XCSDN 2022-04-08 07:44:11 +0000
• 5406d057d3 Pre Merge pull request !439 from yanghaojie001/dev yanghaojie001 2022-04-08 07:44:06 +0000
• de5ae4a05e 添加页签openPage支持传递参数 RuoYi 2022-04-08 15:42:10 +0800
• 3f1468bb3a 1、完成认领菜地和更新认领菜地的后端逻辑，修正之前的错误。 2、优化了前端复选框的逻辑。 jlt 2022-04-07 23:17:23 +0800
• c0d430f4e5
  update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. 字典类型必须以字母开头,且字典类型只能由小写字母或加下划线还有数字组成 防止由于字典类型不符合前端开发规范而报错 XCSDN 2022-04-07 04:57:56 +0000
• 0528b52954 Pre Merge pull request !464 from XCSDN/N/A XCSDN 2022-04-07 04:41:35 +0000
• 39dd019c18
  update ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java. 字典类型需要控制一下,如果不小心写入了空格之类的东西,会导致VUE前端报错 XCSDN 2022-04-07 04:41:33 +0000
• 662d38da56 修复会员入驻的列表刷新错误，合约类中的菜地对象类型错误。 JiaLeiTao 2022-04-07 11:41:22 +0800
• d910888181 代码生成树表新增(展开/折叠) RuoYi 2022-04-07 10:56:40 +0800
• db2dfee6ae 用户缓存信息添加部门ancestors祖级列表 RuoYi 2022-04-07 09:50:42 +0800
• e84fdf8e5a 1、会员入驻列表刷不出来，需要排查错误。 2、会员入驻完成已审阶段的新入驻，下一步需要更改菜地。 jlt 2022-04-06 23:56:06 +0800
• 898fdfe48b 即将完成会员入驻的认领菜地。 jlt 2022-04-05 22:45:30 +0800
• 813671020b 1、完善合约状态字典，以适应多部门流程化操作，初创版直接从申请阶段执行。合约审核后，需要执行完善会员信息和认领菜地2个操作。 2、将菜单会员签约改成合约登记，将农场会员改成会员入驻（实际是执行合约的完善会员信息和认领菜地步骤）。 jlt 2022-04-05 13:55:17 +0800
• c703bb5da1 完善合约状态字典，调整新增合约、修改合约、审核合约（包括会员的自动添加），未处理合约模块的权限。 jlt 2022-04-05 00:54:02 +0800
• 343af94222 Merge branch 'master' of gitee.com:y_project/RuoYi-Vue guoxing 2022-04-04 13:36:20 +0800