Commit d4d2bca85ad17c8aff793eee318a76db65e827cf

Authored by 徐烜
1 parent c0330de2

update

src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_LP.java
... ... @@ -15,7 +15,7 @@ public class ScheduleRule1_LP {
15 15  
16 16 /** 业务主键 */
17 17 @EmbeddedId
18   - private ScheduleRule1_LP_PK1 pk;
  18 + private ScheduleRule1_LP_PK pk;
19 19  
20 20 // 创建日期
21 21 @Column(updatable = false, name = "create_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
... ... @@ -24,11 +24,11 @@ public class ScheduleRule1_LP {
24 24 @Column(name = "update_date", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
25 25 private Date updateDate;
26 26  
27   - public ScheduleRule1_LP_PK1 getPk() {
  27 + public ScheduleRule1_LP_PK getPk() {
28 28 return pk;
29 29 }
30 30  
31   - public void setPk(ScheduleRule1_LP_PK1 pk) {
  31 + public void setPk(ScheduleRule1_LP_PK pk) {
32 32 this.pk = pk;
33 33 }
34 34  
... ...
src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_LP_PK1.java renamed to src/main/java/com/bsth/entity/schedule/rule/ScheduleRule1_LP_PK.java
... ... @@ -9,7 +9,7 @@ import java.io.Serializable;
9 9 * 排班规则1 路牌范围 主键。
10 10 */
11 11 @Embeddable
12   -public class ScheduleRule1_LP_PK1 implements Serializable {
  12 +public class ScheduleRule1_LP_PK implements Serializable {
13 13  
14 14 /** 关联的排班规则1 */
15 15 @ManyToOne(optional = false, cascade = CascadeType.PERSIST, fetch = FetchType.LAZY)
... ... @@ -24,7 +24,7 @@ public class ScheduleRule1_LP_PK1 implements Serializable {
24 24 /** 顺序号 */
25 25 private Integer orderNo;
26 26  
27   - public ScheduleRule1_LP_PK1(ScheduleRule1 scheduleRule1, GuideboardInfo guideboardInfo, Integer orderNo) {
  27 + public ScheduleRule1_LP_PK(ScheduleRule1 scheduleRule1, GuideboardInfo guideboardInfo, Integer orderNo) {
28 28 this.scheduleRule1 = scheduleRule1;
29 29 this.guideboardInfo = guideboardInfo;
30 30 this.orderNo = orderNo;
... ...