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

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

@@ -399,6 +399,8 @@ public class FadGoods extends Controller {
         querySQL.addQueryFields("price", "case when t2.sa_fadadjustid>0 then t2.price else t1.price end");
         querySQL.addQueryFields("price_deposit", "case when t2.sa_fadadjustid>0 then t2.price_deposit else t1.price_deposit end");
         querySQL.addQueryFields("tag", "case when t2.sa_fadadjustid>0 then t2.tag else t1.tag end");
+        querySQL.addQueryFields("isonsale", "case when t2.sa_fadadjustid>0 then t2.isonsale else t1.isonsale end");
+        querySQL.addQueryFields("changedate", "case when t2.sa_fadadjustid>0 then t2.changedate else t1.changedate end");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(wheresql.replace("[", "(").replace("]", ")"));
         querySQL.setWhere("classid", 2);