Merge remote-tracking branch 'origin/developer' into developer

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

@@ -769,14 +769,15 @@ public class NewCmShopController extends BaseController {
 
         CmOperationalLogs sysLog = new CmOperationalLogs();
 
-        if (newCmShops.getMaintenanceFee() == "0") {
-            if (!newCmShop.getMaintenanceFee().equals("0")) {
-                list.add("新增了线上分账商户号");
-            }
-        } else if (!newCmShop.getMaintenanceFee().equals(newCmShops.getMaintenanceFee())) {
-            list.add("修改了线上分账商户号");
-        }
-
+//        if (newCmShops.getMaintenanceFee() == "0") {
+//            if (!newCmShop.getMaintenanceFee().equals("0")) {
+//                list.add("新增了线上分账商户号");
+//            }
+//        }  else {
+//            if (!newCmShop.getMaintenanceFee().equals(newCmShops.getMaintenanceFee())) {
+//                list.add("修改了线上分账商户号");
+//            }
+//        }
         if (newCmShops.getName() == null) {
             if (!newCmShop.getName().equals("")) {
                 list.add("新增了公司名称");