Преглед изворни кода

所有model的id策略去掉序列,改为自动

dongbw пре 8 година
родитељ
комит
45337de266
100 измењених фајлова са 105 додато и 366 уклоњено
  1. 1 2
      src/main/java/com/uas/platform/b2b/erp/model/ErpLog.java
  2. 1 2
      src/main/java/com/uas/platform/b2b/erp/model/PurchaseTenderErp.java
  3. 1 2
      src/main/java/com/uas/platform/b2b/erp/model/SaleTenderErp.java
  4. 1 2
      src/main/java/com/uas/platform/b2b/erp/model/SaleTenderItemErp.java
  5. 1 2
      src/main/java/com/uas/platform/b2b/erp/model/SaleTenderProdErp.java
  6. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/AdvancedSettings.java
  7. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/AppFlowOperation.java
  8. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/ApprovalLog.java
  9. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/BulletinCenter.java
  10. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.java
  11. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/ClockSetCenter.java
  12. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java
  13. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/FeePleaseDetail.java
  14. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/MobileAuditLog.java
  15. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/NewsCenter.java
  16. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/NoticeCenter.java
  17. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/OutAddress.java
  18. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java
  19. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java
  20. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/OutSet.java
  21. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java
  22. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/SignApp.java
  23. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/SignCard.java
  24. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java
  25. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java
  26. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java
  27. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java
  28. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java
  29. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java
  30. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java
  31. 1 2
      src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java
  32. 1 2
      src/main/java/com/uas/platform/b2b/model/AddPartner.java
  33. 1 2
      src/main/java/com/uas/platform/b2b/model/ApbillAdjustment.java
  34. 1 2
      src/main/java/com/uas/platform/b2b/model/ApprovalFlow.java
  35. 1 2
      src/main/java/com/uas/platform/b2b/model/Attach.java
  36. 1 2
      src/main/java/com/uas/platform/b2b/model/B2bCodeSet.java
  37. 1 2
      src/main/java/com/uas/platform/b2b/model/BarLabel.java
  38. 1 2
      src/main/java/com/uas/platform/b2b/model/BarLabelParameter.java
  39. 1 2
      src/main/java/com/uas/platform/b2b/model/BarLabelPrintSetting.java
  40. 1 2
      src/main/java/com/uas/platform/b2b/model/BarPackage.java
  41. 1 2
      src/main/java/com/uas/platform/b2b/model/BarPackageDetail.java
  42. 1 2
      src/main/java/com/uas/platform/b2b/model/BarSendNotify.java
  43. 1 2
      src/main/java/com/uas/platform/b2b/model/ChangeAdmin.java
  44. 1 2
      src/main/java/com/uas/platform/b2b/model/CommunalLog.java
  45. 1 2
      src/main/java/com/uas/platform/b2b/model/Customer.java
  46. 1 2
      src/main/java/com/uas/platform/b2b/model/DeOrderDeleteLog.java
  47. 1 2
      src/main/java/com/uas/platform/b2b/model/DefaultValue.java
  48. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyDefaultValue.java
  49. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java
  50. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyHisVendors.java
  51. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyLastOrderKeywords.java
  52. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyOrder.java
  53. 4 7
      src/main/java/com/uas/platform/b2b/model/DeputyOrderItem.java
  54. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyOrderKeywords.java
  55. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyOrdersLog.java
  56. 1 2
      src/main/java/com/uas/platform/b2b/model/DeputyPaymentCompany.java
  57. 1 2
      src/main/java/com/uas/platform/b2b/model/Distribute.java
  58. 1 2
      src/main/java/com/uas/platform/b2b/model/Enterprise.java
  59. 1 2
      src/main/java/com/uas/platform/b2b/model/FlowNode.java
  60. 1 2
      src/main/java/com/uas/platform/b2b/model/Growth.java
  61. 1 2
      src/main/java/com/uas/platform/b2b/model/GrowthProcess.java
  62. 1 2
      src/main/java/com/uas/platform/b2b/model/GuideSetting.java
  63. 1 2
      src/main/java/com/uas/platform/b2b/model/InvitationRecord.java
  64. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeAccept.java
  65. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeAcceptItem.java
  66. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrder.java
  67. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderChange.java
  68. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderChangeItem.java
  69. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderDone.java
  70. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderEnd.java
  71. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderItem.java
  72. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderReply.java
  73. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeOrderTodo.java
  74. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeReturn.java
  75. 1 2
      src/main/java/com/uas/platform/b2b/model/MakeReturnItem.java
  76. 1 2
      src/main/java/com/uas/platform/b2b/model/Message.java
  77. 1 2
      src/main/java/com/uas/platform/b2b/model/NotExistProduct.java
  78. 1 2
      src/main/java/com/uas/platform/b2b/model/Notice.java
  79. 1 2
      src/main/java/com/uas/platform/b2b/model/NoticeBody.java
  80. 1 2
      src/main/java/com/uas/platform/b2b/model/OfficeTask.java
  81. 1 2
      src/main/java/com/uas/platform/b2b/model/OfficeTaskReply.java
  82. 1 9
      src/main/java/com/uas/platform/b2b/model/PagingRelease.java
  83. 0 156
      src/main/java/com/uas/platform/b2b/model/PagingReleaseCount.java
  84. 4 2
      src/main/java/com/uas/platform/b2b/model/PagingReleaseDetail.java
  85. 1 2
      src/main/java/com/uas/platform/b2b/model/PrintLog.java
  86. 1 2
      src/main/java/com/uas/platform/b2b/model/Product.java
  87. 1 2
      src/main/java/com/uas/platform/b2b/model/ProductMatchResult.java
  88. 1 2
      src/main/java/com/uas/platform/b2b/model/ProductStatus.java
  89. 1 2
      src/main/java/com/uas/platform/b2b/model/ProductStoreStatus.java
  90. 1 2
      src/main/java/com/uas/platform/b2b/model/ProductUsers.java
  91. 1 2
      src/main/java/com/uas/platform/b2b/model/PublicInquiry.java
  92. 1 2
      src/main/java/com/uas/platform/b2b/model/PublicInquiryItem.java
  93. 1 2
      src/main/java/com/uas/platform/b2b/model/PublicInquiryReply.java
  94. 1 2
      src/main/java/com/uas/platform/b2b/model/PurcInquiry.java
  95. 1 2
      src/main/java/com/uas/platform/b2b/model/PurcInquiryInfo.java
  96. 1 2
      src/main/java/com/uas/platform/b2b/model/PurcInquiryItem.java
  97. 1 2
      src/main/java/com/uas/platform/b2b/model/PurcInquiryItemInfo.java
  98. 1 2
      src/main/java/com/uas/platform/b2b/model/PurcOrderInfoItem.java
  99. 1 2
      src/main/java/com/uas/platform/b2b/model/PurchaseAccept.java
  100. 1 2
      src/main/java/com/uas/platform/b2b/model/PurchaseAcceptItem.java

+ 1 - 2
src/main/java/com/uas/platform/b2b/erp/model/ErpLog.java

@@ -41,8 +41,7 @@ public class ErpLog extends BufferedLogable implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$erp_gen")
-	@SequenceGenerator(name = "log$erp_gen", sequenceName = "log$erp_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/erp/model/PurchaseTenderErp.java

@@ -22,8 +22,7 @@ public class PurchaseTenderErp implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$tender_gen")
-    @SequenceGenerator(name = "purc$tender_gen", sequenceName = "purc$tender_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pt_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/erp/model/SaleTenderErp.java

@@ -23,8 +23,7 @@ public class SaleTenderErp implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$tender_gen")
-    @SequenceGenerator(name = "sale$tender_gen", sequenceName = "sale$tender_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "st_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/erp/model/SaleTenderItemErp.java

@@ -18,8 +18,7 @@ public class SaleTenderItemErp implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$tenderitem_gen")
-    @SequenceGenerator(name = "sale$tenderitem_gen", sequenceName = "sale$tenderitem_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "sti_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/erp/model/SaleTenderProdErp.java

@@ -29,8 +29,7 @@ public class SaleTenderProdErp implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$tenderprod_gen")
-    @SequenceGenerator(name = "purc$tenderprod_gen", sequenceName = "purc$tenderprod_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "tp_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/AdvancedSettings.java

@@ -29,8 +29,7 @@ public class AdvancedSettings implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$advancedsettings_gen")
-	@SequenceGenerator(name = "mobile$advancedsettings_gen", sequenceName = "mobile$advancedsettings_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "adv_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/AppFlowOperation.java

@@ -30,8 +30,7 @@ public class AppFlowOperation implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$flowoperation_gen")
-	@SequenceGenerator(name = "mobile$flowoperation_gen", sequenceName = "mobile$flowoperation_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fop_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/ApprovalLog.java

@@ -17,8 +17,7 @@ public class ApprovalLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$applog_gen")
-	@SequenceGenerator(name = "office$applog_gen", sequenceName = "office$applog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/BulletinCenter.java

@@ -30,8 +30,7 @@ public class BulletinCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$bulletincenter_gen")
-	@SequenceGenerator(name = "mobile$bulletincenter_gen", sequenceName = "mobile$bulletincenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bul_id")
 	private Long no_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/ClockAddress.java

@@ -30,8 +30,7 @@ public class ClockAddress implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$clockaddress_gen")
-	@SequenceGenerator(name = "mobile$clockaddress_gen", sequenceName = "mobile$clockaddress_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "cla_id")
 	private Long cs_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/ClockSetCenter.java

@@ -30,8 +30,7 @@ public class ClockSetCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$clocksetcenter_gen")
-	@SequenceGenerator(name = "mobile$clocksetcenter_gen", sequenceName = "mobile$clocksetcenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "clo_id")
 	private Long wd_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/FeePlease.java

@@ -35,8 +35,7 @@ public class FeePlease implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$feeplease_gen")
-	@SequenceGenerator(name = "mobile$feeplease_gen", sequenceName = "mobile$feeplease_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fp_id")
 	private Long fp_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/FeePleaseDetail.java

@@ -35,8 +35,7 @@ public class FeePleaseDetail implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$feepleasedetail_gen")
-	@SequenceGenerator(name = "mobile$feepleasedetail_gen", sequenceName = "mobile$feepleasedetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fpd_id")
 	private Long fpd_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/MobileAuditLog.java

@@ -30,8 +30,7 @@ public class MobileAuditLog implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$auditLog_gen")
-	@SequenceGenerator(name = "mobile$auditLog_gen", sequenceName = "mobile$auditLog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ad_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/NewsCenter.java

@@ -30,8 +30,7 @@ public class NewsCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$newscenter_gen")
-	@SequenceGenerator(name = "mobile$newscenter_gen", sequenceName = "mobile$newscenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "news_id")
 	private Long ne_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/NoticeCenter.java

@@ -30,8 +30,7 @@ public class NoticeCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$noticecenter_gen")
-	@SequenceGenerator(name = "mobile$noticecenter_gen", sequenceName = "mobile$noticecenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "not_id")
 	private Long no_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/OutAddress.java

@@ -27,8 +27,7 @@ public class OutAddress implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outaddress_gen")
-	@SequenceGenerator(name = "mobile$outaddress_gen", sequenceName = "mobile$outaddress_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "oad_id")
 	private Long md_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/OutPlan.java

@@ -32,8 +32,7 @@ public class OutPlan implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outplan_gen")
-	@SequenceGenerator(name = "mobile$outplan_gen", sequenceName = "mobile$outplan_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "op_id")
 	private Long mp_id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/OutPlanDetail.java

@@ -36,8 +36,7 @@ public class OutPlanDetail implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outplandetail_gen")
-	@SequenceGenerator(name = "mobile$outplandetail_gen", sequenceName = "mobile$outplandetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "opd_id")
 	private Long mpd_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/OutSet.java

@@ -26,8 +26,7 @@ public class OutSet implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outset_gen")
-	@SequenceGenerator(name = "mobile$outset_gen", sequenceName = "mobile$outset_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "out_id")
 	private Long mo_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/OutSign.java

@@ -27,8 +27,7 @@ public class OutSign implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$outsign_gen")
-	@SequenceGenerator(name = "mobile$outsign_gen",sequenceName = "mobile$outsign_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sign_id")
 	private Long mo_id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/SignApp.java

@@ -30,8 +30,7 @@ public class SignApp implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signapp_gen")
-	@SequenceGenerator(name = "mobile$signapp_gen", sequenceName = "mobile$signapp_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ms_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/SignCard.java

@@ -30,8 +30,7 @@ public class SignCard implements Serializable, Comparable<SignCard> {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signcard_gen")
-	@SequenceGenerator(name = "mobile$signcard_gen", sequenceName = "mobile$signcard_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sig_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/SignCardLog.java

@@ -30,8 +30,7 @@ public class SignCardLog implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$signcardlog_gen")
-	@SequenceGenerator(name = "mobile$signcardlog_gen", sequenceName = "mobile$signcardlog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "sgl_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/UserCenter.java

@@ -29,8 +29,7 @@ public class UserCenter implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$usercenter_gen")
-	@SequenceGenerator(name = "mobile$usercenter_gen", sequenceName = "mobile$usercenter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "user_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/Vacation.java

@@ -30,8 +30,7 @@ public class Vacation implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$vacation_gen")
-	@SequenceGenerator(name = "mobile$vacation_gen", sequenceName = "mobile$vacation_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "va_id")
 	private Long va_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/VisitRecord.java

@@ -32,8 +32,7 @@ public class VisitRecord implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$visitRecord_gen")
-	@SequenceGenerator(name = "mobile$visitRecord_gen", sequenceName = "mobile$visitRecord_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "vr_id")
 	private Long vr_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/WorkDaily.java

@@ -32,8 +32,7 @@ public class WorkDaily implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workdaily_gen")
-	@SequenceGenerator(name = "mobile$workdaily_gen", sequenceName = "mobile$workdaily_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wd_id")
 	private Long wd_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/WorkData.java

@@ -30,8 +30,7 @@ public class WorkData implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workdata_gen")
-	@SequenceGenerator(name = "mobile$workdata_gen", sequenceName = "mobile$workdata_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wd_id")
 	private Long wd_id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertime.java

@@ -35,8 +35,7 @@ public class WorkOvertime implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workovertime_gen")
-	@SequenceGenerator(name = "mobile$workovertime_gen", sequenceName = "mobile$workovertime_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wo_id")
 	private Long wo_id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/mobile/model/WorkOvertimeDet.java

@@ -36,8 +36,7 @@ public class WorkOvertimeDet implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "mobile$workovertimedet_gen")
-	@SequenceGenerator(name = "mobile$workovertimedet_gen", sequenceName = "mobile$workovertimedet_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "wod_id")
 	private Long wod_id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/AddPartner.java

@@ -27,8 +27,7 @@ public class AddPartner implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$addpartner_gen")
-	@SequenceGenerator(name = "purc$addpartner_gen", sequenceName = "purc$addpartner_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ap_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ApbillAdjustment.java

@@ -36,8 +36,7 @@ public class ApbillAdjustment implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$apbilladjustment_gen")
-	@SequenceGenerator(name = "purc$apbilladjustment_gen", sequenceName = "purc$apbilladjustment_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "aa_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ApprovalFlow.java

@@ -35,8 +35,7 @@ public class ApprovalFlow implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$approvalflow_gen")
-	@SequenceGenerator(name = "office$approvalflow_gen", sequenceName = "office$approvalflow_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "app_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Attach.java

@@ -26,8 +26,7 @@ public class Attach implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "attachs_gen")
-	@SequenceGenerator(name = "attachs_gen", sequenceName = "attachs_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "at_id")
 	private Long id;
 	/**

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/B2bCodeSet.java

@@ -20,8 +20,7 @@ public class B2bCodeSet implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "b2b$CodeSet_gen")
-	@SequenceGenerator(name = "b2b$CodeSet_gen", sequenceName = "b2b$CodeSet_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bc_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarLabel.java

@@ -28,8 +28,7 @@ public class BarLabel implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$label_gen")
-	@SequenceGenerator(name = "bar$label_gen", sequenceName = "bar$label_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "la_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarLabelParameter.java

@@ -23,8 +23,7 @@ public class BarLabelParameter implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$labelParameter_gen")
-	@SequenceGenerator(name = "bar$labelParameter_gen", sequenceName = "bar$labelParameter_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "lp_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarLabelPrintSetting.java

@@ -30,8 +30,7 @@ public class BarLabelPrintSetting implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$labelprintsetting_gen")
-	@SequenceGenerator(name = "bar$labelprintsetting_gen", sequenceName = "bar$labelprintsetting_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "lps_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarPackage.java

@@ -30,8 +30,7 @@ public class BarPackage implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$package_gen")
-	@SequenceGenerator(name = "bar$package_gen", sequenceName = "bar$package_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pa_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarPackageDetail.java

@@ -22,8 +22,7 @@ public class BarPackageDetail implements Serializable{
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$packagedetail_gen")
-	@SequenceGenerator(name = "bar$packagedetail_gen", sequenceName = "bar$packagedetail_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pd_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/BarSendNotify.java

@@ -27,8 +27,7 @@ public class BarSendNotify implements Serializable{
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "bar$sendnotify_gen")
-	@SequenceGenerator(name = "bar$sendnotify_gen", sequenceName = "bar$sendnotify_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "bsn_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ChangeAdmin.java

@@ -43,8 +43,7 @@ public class ChangeAdmin implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "changeadmin_gen")
-	@SequenceGenerator(name = "changeadmin_gen", sequenceName = "changeadmin_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "en_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/CommunalLog.java

@@ -24,8 +24,7 @@ public class CommunalLog extends BufferedLogable implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$common_gen")
-    @SequenceGenerator(name = "log$common_gen", sequenceName = "log$common_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "log_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Customer.java

@@ -29,8 +29,7 @@ public class Customer implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sale$customers_gen")
-	@SequenceGenerator(name = "sale$customers_gen", sequenceName = "sale$customers_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "cu_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeOrderDeleteLog.java

@@ -27,8 +27,7 @@ public class DeOrderDeleteLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deorderdeletelog_gen")
-	@SequenceGenerator(name = "purc$deorderdeletelog_gen", sequenceName = "purc$deorderdeletelog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DefaultValue.java

@@ -21,8 +21,7 @@ public class DefaultValue implements Serializable {
      * 主键id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "defaultvalue_gen")
-    @SequenceGenerator(name = "defaultvalue_gen", sequenceName = "defaultvalue_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "dv_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyDefaultValue.java

@@ -22,8 +22,7 @@ public class DeputyDefaultValue implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "deputy$defaultvalue_gen")
-	@SequenceGenerator(name = "deputy$defaultvalue_gen", sequenceName = "deputy$defaultvalue_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyEnterprise.java

@@ -30,8 +30,7 @@ public class DeputyEnterprise implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyenterprise_gen")
-	@SequenceGenerator(name = "purc$deputyenterprise_gen", sequenceName = "purc$deputyenterprise_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "de_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyHisVendors.java

@@ -30,8 +30,7 @@ public class DeputyHisVendors implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyhisvendors_gen")
-	@SequenceGenerator(name = "purc$deputyhisvendors_gen", sequenceName = "purc$deputyhisvendors_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dh_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyLastOrderKeywords.java

@@ -30,8 +30,7 @@ public class DeputyLastOrderKeywords implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputylastkeyword_gen")
-	@SequenceGenerator(name = "purc$deputylastkeyword_gen", sequenceName = "purc$deputylastkeyword_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dl_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyOrder.java

@@ -38,8 +38,7 @@ public class DeputyOrder implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorders_gen")
-	@SequenceGenerator(name = "purc$deputyorders_gen", sequenceName = "purc$deputyorders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "deo_id")
 	private Long id;
 

+ 4 - 7
src/main/java/com/uas/platform/b2b/model/DeputyOrderItem.java

@@ -1,6 +1,7 @@
 package com.uas.platform.b2b.model;
 
-import java.io.Serializable;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
@@ -10,11 +11,8 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.io.Serializable;
 
 /**
  * 代采订单明细
@@ -35,8 +33,7 @@ public class DeputyOrderItem implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorderitems_gen")
-	@SequenceGenerator(name = "purc$deputyorderitems_gen", sequenceName = "purc$deputyorderitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dei_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyOrderKeywords.java

@@ -30,8 +30,7 @@ public class DeputyOrderKeywords implements Serializable {
 	 * 主键id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputykeywords_gen")
-	@SequenceGenerator(name = "purc$deputykeywords_gen", sequenceName = "purc$deputykeywords_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dk_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyOrdersLog.java

@@ -27,8 +27,7 @@ public class DeputyOrdersLog implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputyorderslog_gen")
-	@SequenceGenerator(name = "purc$deputyorderslog_gen", sequenceName = "purc$deputyorderslog_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "log_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/DeputyPaymentCompany.java

@@ -33,8 +33,7 @@ public class DeputyPaymentCompany implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$deputypaymentcompany_gen")
-	@SequenceGenerator(name = "purc$deputypaymentcompany_gen", sequenceName = "purc$deputypaymentcompany_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "dpc_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Distribute.java

@@ -27,8 +27,7 @@ public class Distribute implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$distribute_gen")
-	@SequenceGenerator(name = "purc$distribute_gen", sequenceName = "purc$distribute_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pd_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -30,8 +30,7 @@ public class Enterprise implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "enterprises_gen")
-	@SequenceGenerator(name = "enterprises_gen", sequenceName = "enterprises_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "en_uu")
 	private Long uu;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/FlowNode.java

@@ -43,8 +43,7 @@ public class FlowNode implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$flownode_gen")
-	@SequenceGenerator(name = "office$flownode_gen", sequenceName = "office$flownode_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "fn_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Growth.java

@@ -20,8 +20,7 @@ import javax.persistence.Table;
 public class Growth {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$growth_gen")
-	@SequenceGenerator(name = "log$growth_gen", sequenceName = "log$growth_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "grow_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/GrowthProcess.java

@@ -22,8 +22,7 @@ import javax.persistence.Table;
 public class GrowthProcess {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "log$growthprocess_gen")
-	@SequenceGenerator(name = "log$growthprocess_gen", sequenceName = "log$growthprocess_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "process_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/GuideSetting.java

@@ -22,8 +22,7 @@ public class GuideSetting implements Serializable {
      * id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sec$guidesetting_gen")
-    @SequenceGenerator(name = "sec$guidesetting_gen", sequenceName = "sec$guidesetting_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "gu_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/InvitationRecord.java

@@ -20,8 +20,7 @@ public class InvitationRecord implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "invitationrecords_gen")
-	@SequenceGenerator(name = "invitationrecords_gen", sequenceName = "invitationrecords_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeAccept.java

@@ -21,8 +21,7 @@ public class MakeAccept implements Serializable {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$accept_gen")
-	@SequenceGenerator(name = "make$accept_gen", sequenceName = "make$accept_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeAcceptItem.java

@@ -36,8 +36,7 @@ public class MakeAcceptItem {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$acceptitem_gen")
-	@SequenceGenerator(name = "make$acceptitem_gen", sequenceName = "make$acceptitem_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mai_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrder.java

@@ -30,8 +30,7 @@ public class MakeOrder implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderChange.java

@@ -38,8 +38,7 @@ public class MakeOrderChange implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changes_gen")
-	@SequenceGenerator(name = "make$changes_gen", sequenceName = "make$changes_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mc_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderChangeItem.java

@@ -30,8 +30,7 @@ import com.uas.platform.core.model.Constant;
 public class MakeOrderChangeItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$changeitems_gen")
-	@SequenceGenerator(name = "make$changeitems_gen", sequenceName = "make$changeitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mcd_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderDone.java

@@ -27,8 +27,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderDone {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderEnd.java

@@ -27,8 +27,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderEnd  {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderItem.java

@@ -38,8 +38,7 @@ public class MakeOrderItem implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orderitems_gen")
-	@SequenceGenerator(name = "make$orderitems_gen", sequenceName = "make$orderitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mai_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderReply.java

@@ -37,8 +37,7 @@ public class MakeOrderReply implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$reply_gen")
-	@SequenceGenerator(name = "make$reply_gen", sequenceName = "make$reply_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mr_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeOrderTodo.java

@@ -28,8 +28,7 @@ import org.hibernate.annotations.Where;
 public class MakeOrderTodo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$orders_gen")
-	@SequenceGenerator(name = "make$orders_gen", sequenceName = "make$orders_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ma_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeReturn.java

@@ -31,8 +31,7 @@ public class MakeReturn implements Serializable {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$return_gen")
-	@SequenceGenerator(name = "make$return_gen", sequenceName = "make$return_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mr_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/MakeReturnItem.java

@@ -36,8 +36,7 @@ public class MakeReturnItem {
 	 * 主键ID
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "make$returnitem_gen")
-	@SequenceGenerator(name = "make$returnitem_gen", sequenceName = "make$returnitem_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "mri_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Message.java

@@ -27,8 +27,7 @@ public class Message implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$messages_gen")
-	@SequenceGenerator(name = "info$messages_gen", sequenceName = "info$messages_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	private Long id;
 
 	/**

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/NotExistProduct.java

@@ -24,8 +24,7 @@ public class NotExistProduct implements Serializable {
      * id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "erp$products_gen")
-    @SequenceGenerator(name = "erp$products_gen", sequenceName = "erp$products_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pr_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Notice.java

@@ -20,8 +20,7 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
 public class Notice {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$notices_gen")
-	@SequenceGenerator(name = "info$notices_gen", sequenceName = "info$notices_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "no_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/NoticeBody.java

@@ -22,8 +22,7 @@ import javax.persistence.Table;
 public class NoticeBody {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "info$noticesbody_gen")
-	@SequenceGenerator(name = "info$noticesbody_gen", sequenceName = "info$noticesbody_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "nb_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/OfficeTask.java

@@ -27,8 +27,7 @@ public class OfficeTask implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$task_gen")
-	@SequenceGenerator(name = "office$task_gen", sequenceName = "office$task_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ta_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/OfficeTaskReply.java

@@ -24,8 +24,7 @@ public class OfficeTaskReply implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "office$taskreply_gen")
-	@SequenceGenerator(name = "office$taskreply_gen", sequenceName = "office$taskreply_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "tar_id")
 	private Long id;
 

+ 1 - 9
src/main/java/com/uas/platform/b2b/model/PagingRelease.java

@@ -27,8 +27,7 @@ public class PagingRelease implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$pagingrelease_gen")
-    @SequenceGenerator(name = "purc$pagingrelease_gen", sequenceName = "purc$pagingrelease_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pr_id")
     private Long id;
 
@@ -57,13 +56,6 @@ public class PagingRelease implements Serializable {
     @JoinColumn(name = "pr_enuu", insertable = false, updatable = false)
     private EnterpriseInfo enterprise;
 
-//    /**
-//     * 采购单所属采购员
-//     */
-//    @OneToOne(cascade = { CascadeType.REFRESH })
-//    @JoinColumn(name = "pr_emuu", insertable = false, updatable = false)
-//    private UserBaseInfo user;
-
     /**
      * 推送时间
      */

+ 0 - 156
src/main/java/com/uas/platform/b2b/model/PagingReleaseCount.java

@@ -1,156 +0,0 @@
-package com.uas.platform.b2b.model;
-
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
-/**
- * 未读消息统计表
- * Created by wangmh on 2017/7/7.
- */
-@Entity
-@Table(name = "purc$pagingreleasecount")
-public class PagingReleaseCount implements Serializable{
-
-    /**
-     * 序号
-     */
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$pagingreleasecount_gen")
-    @SequenceGenerator(name = "purc$pagingreleasecount_gen", sequenceName = "purc$pagingreleasecount_seq", allocationSize = 1)
-    @Column(name = "prc_id")
-    private Long id;
-
-    /**
-     * 用户UU号
-     */
-    @Column(name = "prc_useruu")
-    private Long userUU;
-
-    /**
-     * 用户
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "prc_useruu", insertable = false, updatable = false)
-    private User user;
-
-    /**
-     * 企业UU号
-     */
-    @Column(name = "prc_enuu")
-    private Long enUU;
-
-    /**
-     * 企业
-     */
-    @OneToOne(cascade = { CascadeType.REFRESH })
-    @JoinColumn(name = "prc_enuu", insertable = false, updatable = false)
-    private Enterprise enterprise;
-
-    /**
-     * 单据对应的表名(值小写)
-     */
-    @Column(name = "prc_table")
-    private String table;
-
-    /**
-     * 单据分类(sale or purc)
-     */
-    @Column(name = "prc_category")
-    private String category;
-
-    /**
-     * 消息数量
-     */
-    @Column(name = "prc_count")
-    private Integer count;
-
-    /**
-     * 统计单据状态(-1为统计全部单据)
-     */
-    @Column(name = "prc_orderstatus")
-    private Integer orderStatus;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public User getUser() {
-        return user;
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public Enterprise getEnterprise() {
-        return enterprise;
-    }
-
-    public void setEnterprise(Enterprise enterprise) {
-        this.enterprise = enterprise;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public void setTable(String table) {
-        this.table = table;
-    }
-
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public Integer getCount() {
-        return count;
-    }
-
-    public void setCount(Integer count) {
-        this.count = count;
-    }
-
-    public Long getUserUU() {
-        return userUU;
-    }
-
-    public void setUserUU(Long userUU) {
-        this.userUU = userUU;
-    }
-
-    public Long getEnUU() {
-        return enUU;
-    }
-
-    public void setEnUU(Long enUU) {
-        this.enUU = enUU;
-    }
-
-    public Integer getOrderStatus() {
-        return orderStatus;
-    }
-
-    public void setOrderStatus(Integer orderStatus) {
-        this.orderStatus = orderStatus;
-    }
-}

+ 4 - 2
src/main/java/com/uas/platform/b2b/model/PagingReleaseDetail.java

@@ -3,6 +3,7 @@ package com.uas.platform.b2b.model;
 import com.uas.platform.core.model.Constant;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -20,8 +21,7 @@ public class PagingReleaseDetail implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$pagingreleasedetail_gen")
-    @SequenceGenerator(name = "purc$pagingreleasedetail_gen", sequenceName = "purc$pagingreleasedetail_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "prd_id")
     private Long id;
 
@@ -29,6 +29,7 @@ public class PagingReleaseDetail implements Serializable{
      * 接收人UU
      */
     @Column(name = "prd_emuu")
+    @NotNull
     private Long vendUserUU;
 
 //    /**
@@ -42,6 +43,7 @@ public class PagingReleaseDetail implements Serializable{
      * 供应商企业UU
      */
     @Column(name = "prd_venduu")
+    @NotNull
     private Long vendUU;
 
     /**

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PrintLog.java

@@ -18,8 +18,7 @@ public class PrintLog implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "print$log_gen")
-    @SequenceGenerator(name = "print$log_gen", sequenceName = "print$log_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pl_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/Product.java

@@ -30,8 +30,7 @@ import java.util.Set;
 public class Product {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "products_gen")
-	@SequenceGenerator(name = "products_gen", sequenceName = "products_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pr_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ProductMatchResult.java

@@ -26,8 +26,7 @@ public class ProductMatchResult implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "productmatchresults_gen")
-	@SequenceGenerator(name = "productmatchresults_gen", sequenceName = "productmatchresults_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pr_id")
 	private Long id;
 	

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ProductStatus.java

@@ -21,8 +21,7 @@ public class ProductStatus implements Serializable{
     private static final long serialVersionUID = 1L;
 
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$status_gen")
-    @SequenceGenerator(name = "product$status_gen", sequenceName = "product$status_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "prs_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ProductStoreStatus.java

@@ -28,8 +28,7 @@ public class ProductStoreStatus implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$storestaus_gen")
-	@SequenceGenerator(name = "product$storestaus_gen", sequenceName = "product$storestaus_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pr_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/ProductUsers.java

@@ -22,8 +22,7 @@ public class ProductUsers implements Serializable {
      * id
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "product$users_gen")
-    @SequenceGenerator(name = "product$users_gen", sequenceName = "product$users_seq", allocationSize = 1)
+    @GeneratedValue(strategy = GenerationType.AUTO)
     @Column(name = "pu_id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PublicInquiry.java

@@ -28,8 +28,7 @@ public class PublicInquiry implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public$inquiry_gen")
-	@SequenceGenerator(name = "public$inquiry_gen", sequenceName = "public$inquiry_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PublicInquiryItem.java

@@ -30,8 +30,7 @@ public class PublicInquiryItem implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public$inquiryitems_gen")
-	@SequenceGenerator(name = "public$inquiryitems_gen", sequenceName = "public$inquiryitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PublicInquiryReply.java

@@ -20,8 +20,7 @@ public class PublicInquiryReply implements Serializable {
 	 * id
 	 */
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "public$inquiryreply_gen")
-	@SequenceGenerator(name = "public$inquiryreply_gen", sequenceName = "public$inquiryreply_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "ir_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurcInquiry.java

@@ -37,8 +37,7 @@ public class PurcInquiry implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$puinquiry_gen")
-	@SequenceGenerator(name = "purc$puinquiry_gen", sequenceName = "purc$puinquiry_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurcInquiryInfo.java

@@ -39,8 +39,7 @@ public class PurcInquiryInfo implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$puinquiry_gen")
-	@SequenceGenerator(name = "purc$puinquiry_gen", sequenceName = "purc$puinquiry_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "in_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurcInquiryItem.java

@@ -17,8 +17,7 @@ import java.util.*;
 public class PurcInquiryItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$puinquirytimes_gen")
-	@SequenceGenerator(name = "purc$puinquirytimes_gen", sequenceName = "purc$puinquirytimes_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurcInquiryItemInfo.java

@@ -14,8 +14,7 @@ import java.util.Date;
 public class PurcInquiryItemInfo {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$puinquirytimes_gen")
-	@SequenceGenerator(name = "purc$puinquirytimes_gen", sequenceName = "purc$puinquirytimes_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "id_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurcOrderInfoItem.java

@@ -16,8 +16,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 public class PurcOrderInfoItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$orderitems_gen")
-	@SequenceGenerator(name = "purc$orderitems_gen", sequenceName = "purc$orderitems_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pd_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurchaseAccept.java

@@ -34,8 +34,7 @@ public class PurchaseAccept implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$accept_gen")
-	@SequenceGenerator(name = "purc$accept_gen", sequenceName = "purc$accept_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pa_id")
 	private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2b/model/PurchaseAcceptItem.java

@@ -33,8 +33,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 public class PurchaseAcceptItem {
 
 	@Id
-	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "purc$acceptitem_gen")
-	@SequenceGenerator(name = "purc$acceptitem_gen", sequenceName = "purc$acceptitem_seq", allocationSize = 1)
+	@GeneratedValue(strategy = GenerationType.AUTO)
 	@Column(name = "pai_id")
 	private Long id;
 

Неке датотеке нису приказане због велике количине промена