Merge remote-tracking branch 'origin/develop-yellow' into develop2

src/custom/restcontroller/webmanage/saletool/fad/FadGoods.java

@@ -62,8 +62,10 @@ public class FadGoods extends Controller {
             }
         }
 
-        //上下架
-        listSQL.add(FadHelper.getIsOnSalesUpdateSQL(this, sa_fadid).getSQL());
+        if (sys_enterpriseid == 0) {
+            //上下架
+            listSQL.add(FadHelper.getIsOnSalesUpdateSQL(this, sa_fadid).getSQL());
+        }
         dbConnect.runSqlUpdate(listSQL);