youxiw2000 / bsthLineProfiles · Commits

Commit fb471e63ae870f7439baef8fec7e4aa4376382a0

Authored by yiming
1 parent b975e446
build: skipped

bf

Inline Side-by-side
Showing 14 changed files with 19 additions and 19 deletions
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/BsthTLine.java
  View file @fb471e6
... ... @@ -242,8 +242,8 @@ public class BsthTLine extends BaseEntity
242 242 @Excel(name = "线路总配人数")
243 243 private Long numberPerson;
244 244  
245   - /** 人数司机 */
246   - @Excel(name = "人数司机")
  245 + /** 司机人数 */
  246 + @Excel(name = "司机人数")
247 247 private Long numberPersonDriver;
248 248  
249 249 /** 售票员数 */
... ...
bsthLineProfiles/src/main/java/com/ruoyi/project/system/line/domain/LineHistoryReport.java
  View file @fb471e6
... ... @@ -295,9 +295,9 @@ public class LineHistoryReport extends BaseEntity
295 295 @Excel(name = "原线路总配人数")
296 296 private Long numberPersonOld;
297 297  
298   - @Excel(name = "人数司机")
  298 + @Excel(name = "司机人数")
299 299 private Long numberPersonDriver;
300   - @Excel(name = "原人数司机")
  300 + @Excel(name = "原司机人数")
301 301 private Long numberPersonDriverOld;
302 302  
303 303  
... ...
bsthLineProfiles/src/main/resources/application-druid.yml
  View file @fb471e6
... ... @@ -13,7 +13,7 @@ spring:
13 13 master:
14 14 url: jdbc:mysql://localhost:3306/bsth_line_profiles?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
15 15 username: root
16   - password: 1995627a
  16 + password: Aa123456
17 17 # 从库数据源
18 18 slave:
19 19 # 从数据源开关/默认关闭
... ...
bsthLineProfiles/src/main/resources/application.yml
  View file @fb471e6
... ... @@ -80,7 +80,7 @@ spring:
80 80 # 数据库索引
81 81 database: 0
82 82 # 密码
83   - #password: test123
  83 + password: test123
84 84 # 连接超时时间
85 85 timeout: 10s
86 86 lettuce:
... ...
bsthLineProfiles/src/main/resources/templates/system/line/detail.html
  View file @fb471e6
... ... @@ -463,7 +463,7 @@
463 463 </div></span>
464 464 <!---------------------------------->
465 465 <span id="numberPersonDriver">
466   - <label class="col-sm-1 control-label">人数司机：</label>
  466 + <label class="col-sm-1 control-label">司机人数：</label>
467 467 <div class="col-sm-2">
468 468 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
469 469 </div></span>
... ...
bsthLineProfiles/src/main/resources/templates/system/line/line.html
  View file @fb471e6
... ... @@ -168,7 +168,7 @@
168 168 </li>
169 169 <li><label>线路总配人数：</label> <input type="text"
170 170 name="numberPerson" /></li>
171   - <li><label>人数司机：</label> <input type="text"
  171 + <li><label>司机人数：</label> <input type="text"
172 172 name="numberPersonDriver" /></li>
173 173 <li><label>售票员数：</label> <input type="text"
174 174 name="numberPersonSales" /></li>
... ... @@ -742,7 +742,7 @@
742 742 title: '线路总配人数'
743 743 },{
744 744 field: 'numberPersonDriver',
745   - title: '人数司机'
  745 + title: '司机人数'
746 746 }, {
747 747 field: 'numberPersonSales',
748 748 title: '售票员数'
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/add.html
  View file @fb471e6
... ... @@ -380,7 +380,7 @@
380 380 <input name="numberPerson" class="form-control" type="text">
381 381 </div>
382 382 <!---------------------------------->
383   - <label class="col-sm-1 control-label">人数司机：</label>
  383 + <label class="col-sm-1 control-label">司机人数：</label>
384 384 <div class="col-sm-2">
385 385 <input name="numberPersonDriver" class="form-control" type="text">
386 386 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineAdd/edit.html
  View file @fb471e6
... ... @@ -394,7 +394,7 @@
394 394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
395 395 </div>
396 396 <!---------------------------------->
397   - <label class="col-sm-1 control-label">人数司机：</label>
  397 + <label class="col-sm-1 control-label">司机人数：</label>
398 398 <div class="col-sm-2">
399 399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
400 400 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineExamine/detail.html
  View file @fb471e6
... ... @@ -388,7 +388,7 @@
388 388 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text" disabled>
389 389 </div>
390 390 <!---------------------------------->
391   - <label class="col-sm-1 control-label">人数司机：</label>
  391 + <label class="col-sm-1 control-label">司机人数：</label>
392 392 <div class="col-sm-2">
393 393 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text" disabled>
394 394 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/edit.html
  View file @fb471e6
... ... @@ -394,7 +394,7 @@
394 394 <input name="numberPerson" th:field="*{numberPerson}" class="form-control" type="text">
395 395 </div>
396 396 <!---------------------------------->
397   - <label class="col-sm-1 control-label">人数司机：</label>
  397 + <label class="col-sm-1 control-label">司机人数：</label>
398 398 <div class="col-sm-2">
399 399 <input name="numberPersonDriver" th:field="*{numberPersonDriver}" class="form-control" type="text">
400 400 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineHistory/historyCompare.html
  View file @fb471e6
... ... @@ -244,7 +244,7 @@
244 244 <span class="col-sm-9"id="numberPerson">{{line.numberPerson}}</span>
245 245 </div>
246 246 <div class="col-sm-6">
247   - <label class="col-sm-3 control-label">人数司机：</label>
  247 + <label class="col-sm-3 control-label">司机人数：</label>
248 248 <span class="col-sm-9"id="numberPersonDriver">{{line.numberPersonDriver}}</span>
249 249 </div>
250 250 <div class="col-sm-6">
... ... @@ -604,7 +604,7 @@
604 604 </span>
605 605 </div>
606 606 <div class="col-sm-6">
607   - <label class="col-sm-3 control-label">人数司机：</label>
  607 + <label class="col-sm-3 control-label">司机人数：</label>
608 608 <span class="col-sm-9">
609 609 {{oldLine.numberPersonDriver}}
610 610 </span>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/add.html
  View file @fb471e6
... ... @@ -368,7 +368,7 @@
368 368 </div>
369 369 </div>
370 370 <div class="form-group">
371   - <label class="col-sm-3 control-label">人数司机：</label>
  371 + <label class="col-sm-3 control-label">司机人数：</label>
372 372 <div class="col-sm-8">
373 373 <input name="numberPersonDriver" class="form-control" type="text">
374 374 </div>
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/edit.html
  View file @fb471e6
... ... @@ -426,7 +426,7 @@
426 426 </div>
427 427 </div>
428 428 <div class="form-group">
429   - <label class="col-sm-3 control-label">人数司机：</label>
  429 + <label class="col-sm-3 control-label">司机人数：</label>
430 430 <div class="col-sm-8">
431 431 <input name="numberPersonDriver" th:field="*{numberPersonDriver}"
432 432 class="form-control" type="text">
... ...
bsthLineProfiles/src/main/resources/templates/system/lineReport/line.html
  View file @fb471e6
... ... @@ -162,7 +162,7 @@
162 162 </li>
163 163 <li><label>线路总配人数：</label> <input type="text"
164 164 name="numberPerson" /></li>
165   - <li><label>人数司机：</label> <input type="text"
  165 + <li><label>司机人数：</label> <input type="text"
166 166 name="numberPersonDriver" /></li>
167 167 <li><label>售票员数：</label> <input type="text"
168 168 name="numberPersonSales" /></li>
... ... @@ -665,7 +665,7 @@
665 665 title: '线路总配人数'
666 666 },{
667 667 field: 'numberPersonDriver',
668   - title: '人数司机'
  668 + title: '司机人数'
669 669 }, {
670 670 field: 'numberPersonSales',
671 671 title: '售票员数'
... ...