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

src/custom/restcontroller/webmanage/saletool/store/StoreAgent.java

@@ -41,6 +41,10 @@ public class StoreAgent extends Controller {
                 where.append("t1.storename like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.name like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append("or t2.phonenumber like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.province like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.city like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.county like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.address like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }