Merge remote-tracking branch 'origin/feature-201815-liusw' into feature-201815-liusw

src/main/java/com/uas/platform/b2c/prod/commodity/model/ProductAttachSubmit.java

@@ -56,6 +56,7 @@ public class ProductAttachSubmit implements Serializable{
     /**
      * 型号
      */
+    @Column(name = "code")
     private String code;
 
     /**

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/ProductAttachServiceImpl.java

@@ -156,14 +156,14 @@ public class ProductAttachServiceImpl implements ProductAttachService {
      */
     private ProductAttachSubmit completeReturnSubmit(ProductAttachSubmit submit) {
         if (submit.getAuditEnuu() != null) {
-            EnterpriseBaseInfo enterpriseBaseInfo = enterpriseBaseInfoDao.findOne(submit.getSubmitEnuu());
+            EnterpriseBaseInfo enterpriseBaseInfo = enterpriseBaseInfoDao.findOne(submit.getAuditEnuu());
             if (enterpriseBaseInfo != null) {
                 submit.setAuditEn(enterpriseBaseInfo);
             }
         }
 
         if (submit.getAuditUu() != null) {
-            UserBaseInfo userBaseInfo = userBaseInfoDao.findUserByUserUU(submit.getSubmitUu());
+            UserBaseInfo userBaseInfo = userBaseInfoDao.findUserByUserUU(submit.getAuditUu());
             if (userBaseInfo != null) {
                 submit.setAuditer(userBaseInfo);
             }