Explorar el Código

评论: 数据库主键类型修改

wangdy hace 8 años
padre
commit
f6401de672

+ 1 - 2
src/main/java/com/uas/platform/b2c/trade/rate/model/RateBuyer.java

@@ -18,8 +18,7 @@ public class RateBuyer implements Serializable{
      * ID
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rate$buyer_gen")
-    @SequenceGenerator(name = "rate$buyer_gen", sequenceName = "rate$buyer_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2c/trade/rate/model/RateGoods.java

@@ -20,8 +20,7 @@ public class RateGoods implements Serializable{
      * ID
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rate$goods_gen")
-    @SequenceGenerator(name = "rate$goods_gen", sequenceName = "rate$goods_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2c/trade/rate/model/RateTemplate.java

@@ -22,8 +22,7 @@ public class RateTemplate implements Serializable{
      * ID
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rate$template_gen")
-    @SequenceGenerator(name = "rate$template_gen", sequenceName = "rate$template_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

+ 1 - 2
src/main/java/com/uas/platform/b2c/trade/rate/model/RateVendor.java

@@ -18,8 +18,7 @@ public class RateVendor implements Serializable{
      * ID
      */
     @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "rate$vendor_gen")
-    @SequenceGenerator(name = "rate$vendor_gen", sequenceName = "rate$vendor_seq", allocationSize = 1)
+    @GeneratedValue
     @Column(name = "id")
     private Long id;
 

+ 0 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html

@@ -1169,8 +1169,6 @@
                                 <a class="order-operation" href="javascript:void(0)" ng-if="(purchase.status == 502 || purchase.status == 406)&&(purchase.uasPurcid == null)" ng-click="toBeShiped(purchase)">点击发货</a>
 								<a ng-if="purchase.uasPurcid" style="text-decoration: none;color: #323232;">来源UAS</a>
                                 <!--<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>-->
-								<a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404&&!purchase.uasPurcid" ng-click="modifyLogistic(purchase)" style="position: relative;">修改物流</a>
-                                <div class="seller-ship-tip" ng-if="purchase.status == 404 && purchase.lgtId &&!purchase.uasPurcid" style="position: relative;">
                                 <a class="order-operation" href="javascript:void(0)" ng-if="purchase.status == 404 && purchase.lgtId&&!purchase.uasPurcid" ng-click="toBeShiped(purchase)" style="position: relative;">修改物流</a>
 								<a class="order-operation" href="javascript:void(0)" ng-click="getModal(purchase,'addRate')" style="position: relative;" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isAfterRate && purchase.isFirstRate && requestOver==purchases.length">追加评价</a>
 								<a class="order-operation" href="javascript:void(0)" style="position: relative;" ng-click="getModal(purchase,'firstRate')" ng-if="[405,503,514,506,511,520].indexOf(purchase.status) != -1 && !purchase.isFirstRate && requestOver==purchases.length">评价</a>