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

• fb972249dc 修改bug dev_sjs gongtianyi 2024-06-25 10:10:53 +08:00
• e29636522d 修改bug gongtianyi 2024-06-20 16:22:56 +08:00
• 4dd8ed7a0d 提交专题报告年 18536819133 2023-10-21 13:34:20 +08:00
• 34bf6a2580 提交专题报告年 18536819133 2023-10-20 17:14:48 +08:00
• e9a3ad8dc2 修改配置 18536819133 2023-10-20 16:48:19 +08:00
• b9c6dec44f Merge remote-tracking branch 'origin/dev_sjs' 18536819133 2023-10-20 16:46:38 +08:00
• 4af1c07029 修改配置 master 18536819133 2023-10-20 16:25:34 +08:00
• b0e7b2096d 城市不透水面修改 machao 2023-04-24 14:08:00 +08:00
• f2bf70cf2a 各国、各省省平均EQI分布折线图 machao 2023-03-15 17:57:54 +08:00
• 9158979599 ENSO修改 machao 2023-03-06 17:28:31 +08:00
• d6a411e858 ENSO影响监测 machao 2023-02-28 14:49:13 +08:00
• 41ad8eebc3 大气质量监测模块修改 machao 2023-02-27 11:59:15 +08:00
• d27dad982b 亚大综合监测、森林监测添加柬埔寨各省数据 machao 2023-02-21 15:02:37 +08:00
• ef66a3ff00 数据流动年份 machao 2022-12-07 17:16:21 +08:00
• 94c0e196ed 配置修改 machao 2022-11-14 17:55:23 +08:00
• 448aa856e9 国家查询优化 machao 2022-11-10 15:24:08 +08:00
• 7d7c0dafd1 ENSO事件影响监测 machao 2022-11-10 10:30:17 +08:00
• 96f4881285 综合监测模块字段修改 machao 2022-11-09 15:25:03 +08:00
• 53b00a7d28 综合监测 machao 2022-11-08 16:40:54 +08:00
• 25897b41d8 修改月份字段 machao 2022-11-07 16:43:51 +08:00
• 3fd09cc44a 修改配置 machao 2022-11-03 13:55:05 +08:00
• 53fb8da5c1 PM2.5 machao 2022-11-03 09:54:19 +08:00
• da51b2a55d 修改森林检测模块 宋金生 2022-11-01 18:00:22 +08:00
• aab12640b0 no message 宋金生 2022-11-01 15:29:00 +08:00
• 382d9018e8 修改格式，修改森林数据 宋金生 2022-11-01 15:28:49 +08:00
• 9b61e16fdd 测试提交 dev liuchengqian 2022-08-16 08:48:40 +08:00
• 854afa033d 更新 songjinsheng 2022-08-16 08:36:53 +08:00
• 52095ccd04 修改 songjinsheng 2022-07-14 15:00:55 +08:00
• e348a10862 不透水面修改 songjinsheng 2022-07-12 16:31:23 +08:00
• 2a64885193 修改参数 songjinsheng 2022-07-08 14:46:17 +08:00
• 7943dd8156 no message songjinsheng 2022-07-01 16:10:17 +08:00
• b94ce7f31b 新增1不透水面信息，扩张方位 songjinsheng 2022-07-01 14:26:04 +08:00
• 9665ec2690 no message songjinsheng 2022-07-01 11:05:07 +08:00
• 9c144e2138 新增城市模块 songjinsheng 2022-07-01 11:04:45 +08:00
• b8d90525ae 地图服务 songjinsheng 2022-06-30 16:06:16 +08:00
• b51521dac7 修改mapper songjinsheng 2022-06-28 11:58:12 +08:00
• 0719379052 配置bean songjinsheng 2022-06-24 10:40:21 +08:00
• f52a876226 修改控制器及新增城市功能 songjinsheng 2022-06-24 10:28:33 +08:00
• 11b8a3db44 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev songjinsheng 2022-06-22 15:53:36 +08:00
• 8918116dbd 测试 songjinsheng 2022-06-22 15:43:23 +08:00
• 43ee95a198 修改查询方法，增加查询条件 songjinsheng 2022-06-20 17:06:48 +08:00
• 7c5e92246f 升级依赖包 qdxkrs 2022-06-16 14:13:41 +08:00
• fafe483b53 修改bug songjinsheng 2022-06-16 11:58:56 +08:00
• 6148ca9ae8 修改滑动验证码 qdxkrs 2022-06-16 10:50:51 +08:00
• 3006b3c751 增加redis密码 songjinsheng 2022-06-16 09:49:49 +08:00
• e9e8ea36b7 验证码修改 songjinsheng 2022-06-16 09:49:27 +08:00
• c9ee01dd1f 验证码 songjinsheng 2022-06-16 09:24:27 +08:00
• 2de946adb8 增加各个数据表数据上床功能，切换数据库 songjinsheng 2022-06-08 17:18:59 +08:00
• a4976eff13 修改字典和token过期时间 songjinsheng 2022-05-31 10:47:05 +08:00
• bd12230d7e 修改token过期时间 songjinsheng 2022-05-30 10:17:07 +08:00
• 42e4acf3dd 新增字典功能 songjinsheng 2022-05-30 10:11:39 +08:00
• 498a502c02 添加swagger 新界面 qdxkrs 2022-05-24 12:01:43 +08:00
• 5c0a93f679 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev songjinsheng 2022-05-24 11:29:25 +08:00
• 264a5d910f 修改接口 songjinsheng 2022-05-24 11:29:11 +08:00
• 15bc756bd4 修改冲突文件 qdxkrs 2022-05-23 14:38:09 +08:00
• c424d5cd89 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev qdxkrs 2022-05-23 14:37:16 +08:00
• 9b784c99ed 修改bug qdxkrs 2022-05-23 14:36:19 +08:00
• 5041f3f92f 注解修改 songjinsheng 2022-05-23 14:17:46 +08:00
• f4caf10bd3 合并更新 songjinsheng 2022-05-23 09:49:01 +08:00
• bb6fb94038 Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev songjinsheng 2022-05-23 09:48:47 +08:00
• 7cfae514ea 控制器修改 songjinsheng 2022-05-23 09:42:20 +08:00
• d262ec6b72 更新资源 qdxkrs 2022-05-23 09:39:52 +08:00
• a51c6872d8 飞机✈保佑 qdxkrs 2022-05-20 16:59:45 +08:00
• afa068f477 修改mapper songjinsheng 2022-05-20 15:17:51 +08:00
• c6fa415356 优化目录 qdxkrs 2022-05-20 14:42:13 +08:00
• 6006a9f18c 优化项目结构 qdxkrs 2022-05-20 14:27:08 +08:00
• 1722abfae7 Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms into dev songjinsheng 2022-05-20 14:20:17 +08:00
• 57db36e015 no message songjinsheng 2022-05-20 14:19:34 +08:00
• 43e3d8cfea 修改控制器 songjinsheng 2022-05-20 14:19:25 +08:00
• 1c16fc1d4a 添加基类 qdxkrs 2022-05-20 14:18:53 +08:00
• 598860d544 11 songjinsheng 2022-05-20 11:56:55 +08:00
• 95542bf4c9 Merge branch 'master' into test songjinsheng 2022-05-20 09:00:37 +08:00
• 3598fafe66 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue songjinsheng 2022-05-20 08:59:45 +08:00
• de1dd3a808 功能迭代 songjinsheng 2022-05-20 08:56:41 +08:00
• 9c3b53b701 用户管理左侧树型组件增加选中高亮保持 RuoYi 2022-05-13 15:02:16 +08:00
• f2cb431c90 Merge branch 'master' of https://gitea.star-rising.cn/Song/xkrs_ms songjinsheng 2022-05-11 17:27:34 +08:00
• 9facc1b682 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue songjinsheng 2022-05-11 16:40:50 +08:00
• 93835778ad 修改配置 qdxkrs 2022-05-11 16:40:13 +08:00
• 8020eabaa9 更新 songjinsheng 2022-05-11 15:58:35 +08:00
• 5693bbe1f5 升级oshi到最新版本6.1.6 RuoYi 2022-05-11 09:58:25 +08:00
• 0055f479cb 修复字典数据显示不全问题(I55MR3) RuoYi 2022-05-09 20:27:09 +08:00
• 1c41b701dd 优化excel创建表格样式 RuoYi 2022-05-09 17:37:33 +08:00
• 17f3e0809c
  Pre Merge pull request !484 from 你听/master 你听 2022-05-06 08:32:04 +00:00
• e37a57f1d5
  update README.md. 你听 2022-05-06 08:29:01 +00:00
• b534f24386
  Pre Merge pull request !389 from gwoksing/master gwoksing 2022-05-06 05:57:48 +00:00
• 3d022c387c Merge branch 'master' of gitee.com:y_project/RuoYi-Vue guoxing 2022-05-06 13:57:30 +08:00
• 1b5866f407
  Pre Merge pull request !483 from ZG4vin/master ZG4vin 2022-05-05 16:19:19 +00:00
• bc7888b5a2 代码生成时，vue页面主键字段不筛选是否显示，需将所有vue模板中的column.pk -> column.pkColumn 即可 ZG4vin 2022-05-06 00:15:18 +08:00
• 7cb1fda662
  Pre Merge pull request !481 from likun/master likun 2022-05-05 02:22:02 +00:00
• f8fadb555d Merge remote-tracking branch 'remote-root/master' likun5 2022-05-05 10:21:47 +08:00
• 73a21ec962
  Pre Merge pull request !482 from John Deng/master John Deng 2022-05-03 14:05:51 +00:00
• 26c081c6e4
  添加依赖库 regenerator-runtime 以解决 npm run dev 失败的问题 John Deng 2022-05-03 14:03:13 +00:00
• 6a20ff7033 优化出全局异常打印内容，@RequestParam多参数时打印更详细，@RequestBody拦截时打印参数具体报错原因。 likun5 2022-05-02 21:31:57 +08:00
• 2e3c779e69 重构dept和menu构建树过程：封装构建过程到TreeBuilder类中简化代码，解耦实体对象和TreeSelect的强依赖。 likun5 2022-05-02 21:00:47 +08:00
• 77d5afdffd 代码生成mapper.xml时type使用全类名。 likun5 2022-05-02 12:20:55 +08:00
• cecb1c7319 mapper.xml中resultMap的type使用全类名，解决idea开发工具提示红色报错问题。 likun5 2022-05-02 12:08:08 +08:00
• 32199c42f2 dept/role/user的where中补充del_flag='0'条件，防止查询或更新时数据问题。 likun5 2022-05-02 12:02:07 +08:00
• bf59f92ef0
  Pre Merge pull request !480 from 码农小易/add_has 码农小易 2022-05-02 01:25:14 +00:00
• dfdd0d196f 修复管理员无法无需校验权限问题 码农小易 2022-05-02 09:25:10 +08:00
• 0f830af55d
  Pre Merge pull request !479 from abbfun/N/A abbfun 2022-05-01 12:24:28 +00:00