bugfix

src/main/java/com/caimei/modules/user/entity/NewCmShop.java

@@ -32,7 +32,7 @@ public class NewCmShop extends DataEntity<NewCmShop> {
     private Integer provinceID;
     private Integer cityID;
     private String address;        // 地址
-    private Double registeredCapital;        // 注册资本
+    private String registeredCapital;        // 注册资本
     private String nature;        // 公司性质
     private String turnover;        // 年营业额
     private String linkMan;        // 联系人
@@ -293,11 +293,11 @@ public class NewCmShop extends DataEntity<NewCmShop> {
         this.address = address;
     }
 
-    public Double getRegisteredCapital() {
+    public String getRegisteredCapital() {
         return registeredCapital;
     }
 
-    public void setRegisteredCapital(Double registeredCapital) {
+    public void setRegisteredCapital(String registeredCapital) {
         this.registeredCapital = registeredCapital;
     }
 

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -658,11 +658,11 @@ public class NewCmShopController extends BaseController {
         }
 
         if (newCmShops.getRegisteredCapital() == null) {
-            if (newCmShop.getRegisteredCapital()!=null) {
+            if (newCmShop.getRegisteredCapital().equals("")) {
                 list.add("新增了注册资本");
             }
         }
-        if (newCmShop.getRegisteredCapital() != null) {
+        if (newCmShops.getRegisteredCapital() != null) {
             if (!newCmShop.getRegisteredCapital().equals(newCmShops.getRegisteredCapital()) ) {
                 list.add("修改了注册资本");
             }

src/main/webapp/WEB-INF/views/modules/user/newCmShopForm.jsp

@@ -887,21 +887,21 @@
                 </td>
                 <td>
                     <span>注册资本：</span>
-                    ￥<form:input path="registeredCapital" htmlEscape="false" maxlength="11" placeholder="请填写公司注册资本"
-                                 class="input-xlarge number "/>
+                    ￥<form:input path="registeredCapital" htmlEscape="false"  maxlength="20" placeholder="请填写公司注册资本"
+                                 class="input-xlarge"/>
                 </td>
                 <td>
                     <span>公司性质：</span>
                     <form:input path="nature" htmlEscape="false" maxlength="50" placeholder="请填写公司性质"
-                                class="input-xlarge "/>
+                                class="input-xlarge"/>
                 </td>
             </tr>
 
             <tr>
                 <td>
                     <span>年营业额：</span>
-                    <form:input path="turnover" htmlEscape="false" placeholder="请输入公司年营业额" maxlength="11"
-                                class="input-xlarge number "/>
+                    <form:input path="turnover" htmlEscape="false" placeholder="请输入公司年营业额" maxlength="20"
+                                class="input-xlarge"/>
                 </td>
             </tr>
         </table>